From 0b2eb26d458b32391cc247aab34d7ab7bc9ff221 Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 3 Apr 2023 19:26:53 -0700 Subject: [PATCH] Fix additional contained user/sqldb bugs (#1983) --- src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs | 4 ++-- src/Microsoft.SqlTools.ServiceLayer/Security/UserData.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs index 5122be6b..1f387301 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Security/UserActions.cs @@ -132,8 +132,8 @@ namespace Microsoft.SqlTools.ServiceLayer.Security } // Default language is only applicable for users inside a contained database. - if (parentDb.ContainmentType != ContainmentType.None - && LanguageUtils.IsDefaultLanguageSupported(dataContainer.Server)) + if (LanguageUtils.IsDefaultLanguageSupported(dataContainer.Server) + && parentDb.ContainmentType != ContainmentType.None) { defaultLanguageAlias = LanguageUtils.GetLanguageAliasFromName( existingUser.Parent.Parent, diff --git a/src/Microsoft.SqlTools.ServiceLayer/Security/UserData.cs b/src/Microsoft.SqlTools.ServiceLayer/Security/UserData.cs index 1e475b54..ce8b3994 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Security/UserData.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Security/UserData.cs @@ -870,8 +870,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Security { get { - //Default Language was not supported before Denali. - return SqlMgmtUtils.IsSql11OrLater(this.context.Server.ConnectionContext.ServerVersion); + //Default Language was not supported before Denali or on SQL DB. + bool isSqlAzure = this.context.ServerConnection.DatabaseEngineType == DatabaseEngineType.SqlAzureDatabase; + return !isSqlAzure && SqlMgmtUtils.IsSql11OrLater(this.context.Server.ConnectionContext.ServerVersion); } }