Merge branch '6.0' into 7.0

alex-kulakov · alex-kulakov · commit d27afbbc8aca · 2023-04-12T17:09:46.000+05:00
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs
@@ -44,7 +44,8 @@ private static ErrorMessageParser CreateMessageParser(SqlServerConnection connec
       bool isEnglish;
       using (var command = connection.CreateCommand()) {
         command.CommandText = LangIdQuery;
-        isEnglish = command.ExecuteScalar().ToString()=="0";
+        var langId = (short) command.ExecuteScalar();
+        isEnglish = langId == 0 || langId == 23;
       }
 
       var templates = new Dictionary<int, string>();

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ private static ErrorMessageParser CreateMessageParser(SqlServerConnection connec`
`44`	`44`	`bool isEnglish;`
`45`	`45`	`using (var command = connection.CreateCommand()) {`
`46`	`46`	`command.CommandText = LangIdQuery;`
`47`		`- isEnglish = command.ExecuteScalar().ToString()=="0";`
	`47`	`+ var langId = (short) command.ExecuteScalar();`
	`48`	`+ isEnglish = langId == 0 \|\| langId == 23;`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`var templates = new Dictionary<int, string>();`