Skip to content

Commit 4273ba7

Browse files
committed
Merge branch '7.0' into 7.1
# Conflicts: # ReadMe.md
2 parents a2edff9 + 790a0a1 commit 4273ba7

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ private static ErrorMessageParser CreateMessageParser(SqlServerConnection connec
4444
bool isEnglish;
4545
using (var command = connection.CreateCommand()) {
4646
command.CommandText = LangIdQuery;
47-
isEnglish = command.ExecuteScalar().ToString()=="0";
47+
var langId = (short) command.ExecuteScalar();
48+
isEnglish = langId == 0 || langId == 23;
4849
}
4950

5051
var templates = new Dictionary<int, string>();

Orm/Xtensive.Orm.Tests.Framework/Orm.config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
<domain name="mssql2019"
3434
connectionUrl="sqlserver://localhost\DO_SQL2019/DO-Tests?MultipleActiveResultSets=True" />
35+
36+
<domain name="mssql2022"
37+
connectionUrl="sqlserver://localhost\DO_SQL2022/DO-Tests?MultipleActiveResultSets=True" />
3538

3639
<domain name="pgsql83"
3740
connectionUrl="postgresql://dotest:dotest@localhost:5483/dotest" />
@@ -66,6 +69,9 @@
6669
<domain name="pgsql140"
6770
connectionUrl="postgresql://dotest:dotest@localhost:54140/dotest" />
6871

72+
<domain name="pgsql150"
73+
connectionUrl="postgresql://dotest:dotest@localhost:54150/dotest" />
74+
6975
<domain name="oracle10"
7076
connectionUrl="oracle://dotest:dotest@localhost:5510/ora10" />
7177

@@ -122,6 +128,9 @@
122128
<domain name="mssql2019cs" provider="sqlserver"
123129
connectionString="Data Source=localhost\DO_SQL2019;Initial Catalog=DO-Tests;Integrated Security=True;MultipleActiveResultSets=True" />
124130

131+
<domain name="mssql2022cs" provider="sqlserver"
132+
connectionString="Data Source=localhost\DO_SQL2022;Initial Catalog=DO-Tests;Integrated Security=True;MultipleActiveResultSets=True" />
133+
125134
<domain name="pgsql83cs" provider="postgresql"
126135
connectionString="HOST=localhost;PORT=5483;DATABASE=dotest;USER ID=dotest;PASSWORD=dotest" />
127136

@@ -155,6 +164,9 @@
155164
<domain name="pgsql140cs" provider="postgresql"
156165
connectionString="HOST=localhost;PORT=54140;DATABASE=dotest;USER ID=dotest;PASSWORD=dotest" />
157166

167+
<domain name="pgsql150cs" provider="postgresql"
168+
connectionString="HOST=localhost;PORT=54150;DATABASE=dotest;USER ID=dotest;PASSWORD=dotest" />
169+
158170
<domain name="oracle10cs" provider="oracle"
159171
connectionString="DATA SOURCE=&quot;(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=5510))(CONNECT_DATA=(SERVICE_NAME=ora10)))&quot;;USER ID=dotest;PASSWORD=dotest" />
160172

ReadMe.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
DataObjects.Net is a persistence and object-relational mapping framework for the Microsoft .NET. It allows developers to define persistent objects as well as business logic directly in C#, Visual Basic or F#. The persistent objects can be retrieved by LINQ queries. Persistent data can be stored in SQL Servers. In contrast to many other ORM frameworks the database model is generated and maintained automatically.
44

55
Supported databases:
6-
- MS SQL Server 2012, 2014, 2016, 2017, 2019
6+
- MS SQL Server 2008 R2, 2012, 2014, 2016, 2017, 2019, 2022
77
- MS Azure SQL Database
88
- Oracle 10g, 11g
9-
- PostgreSQL 9.x, 10, 11, 12, 13
10-
- MySQL 5.6, 5.7, 8.0
9+
- PostgreSQL 8.3, 8.4, 9.0, 9.1, 9.2, 10, 11, 12, 13, 14, 15
10+
- MySQL 5.5, 5.6
1111
- Firebird 2.5, 4.0
1212
- Sqlite 3
1313

0 commit comments

Comments
 (0)