From 51d43930204b9a14123fffef2fed148bf98527c2 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Mon, 20 Mar 2023 16:34:46 +0500 Subject: [PATCH 1/2] SqlServer: Both US English and British English are considered english --- .../Sql.Drivers.SqlServer/DriverFactory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs index e9833aa2e6..fc86bd5f60 100644 --- 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(); using (var command = connection.CreateCommand()) { From 1702462b7f7f8ae63e85b06888a08051c9d2fd13 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Tue, 21 Mar 2023 11:21:50 +0500 Subject: [PATCH 2/2] Improve changelog --- ChangeLog/6.0.12_dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog/6.0.12_dev.txt b/ChangeLog/6.0.12_dev.txt index e88636505d..a39ae7e4aa 100644 --- a/ChangeLog/6.0.12_dev.txt +++ b/ChangeLog/6.0.12_dev.txt @@ -1 +1,2 @@ -[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection \ No newline at end of file +[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection +[sqlserver] Sql error messages for British English are correctly parsed \ No newline at end of file