ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

make default language handling robust (#1907)

Browse Source
This commit is contained in:
Hai Cao
2023-03-06 14:50:19 -08:00
committed by GitHub
parent a074b5bf67
commit 49f1b3a496
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.SqlTools.ServiceLayer/Security/LoginData.cs
View File

@@ -2097,7 +2097,11 @@ INNER JOIN sys.sql_logins AS sql_logins
&& 0 != String.Compare(login.DefaultLanguage, SR.DefaultLanguagePlaceholder, StringComparison.Ordinal) && 0 != String.Compare(login.DefaultLanguage, SR.DefaultLanguagePlaceholder, StringComparison.Ordinal)
&& (server.DatabaseEngineType == DatabaseEngineType.Standalone|| server.DatabaseEngineEdition == DatabaseEngineEdition.SqlManagedInstance)) && (server.DatabaseEngineType == DatabaseEngineType.Standalone|| server.DatabaseEngineEdition == DatabaseEngineEdition.SqlManagedInstance))
{ {
this.DefaultLanguage = login.DefaultLanguage.Split(" - ")[1]; string[] arr = login.DefaultLanguage?.Split(" - ");
if (arr != null && arr.Length > 1)
{
this.DefaultLanguage = arr[1];
}
} }
this.DefaultDatabase = login.DefaultDatabase; this.DefaultDatabase = login.DefaultDatabase;
this.EnforcePolicy = login.EnforcePasswordPolicy; this.EnforcePolicy = login.EnforcePasswordPolicy;

6
src/Microsoft.SqlTools.ServiceLayer/Security/SecurityService.cs
View File

@@ -204,7 +204,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Security
prototype.SqlPassword = login.Password; prototype.SqlPassword = login.Password;
if (0 != String.Compare(login.DefaultLanguage, SR.DefaultLanguagePlaceholder, StringComparison.Ordinal)) if (0 != String.Compare(login.DefaultLanguage, SR.DefaultLanguagePlaceholder, StringComparison.Ordinal))
{ {
prototype.DefaultLanguage = login.DefaultLanguage.Split(" - ")[1]; string[] arr = login.DefaultLanguage?.Split(" - ");
if (arr != null && arr.Length > 1)
{
prototype.DefaultLanguage = arr[1];
}
} }
prototype.DefaultDatabase = login.DefaultDatabase; prototype.DefaultDatabase = login.DefaultDatabase;
prototype.EnforcePolicy = login.EnforcePasswordPolicy; prototype.EnforcePolicy = login.EnforcePasswordPolicy;