WIP Add testing DB2 to GitHub Actions

.github/workflows/NetCoreTests.yml

@@ -38,6 +38,20 @@ jobs:
             DB_INIT: |
               docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:21-slim
           - DB: SQLite
+          - DB: DB2
+            CONNECTION_STRING: "Server=localhost:50000;Database=nhib;UID=nhib;PWD=nhib;"
+            DB_INIT: |
+              docker run --name DB2 --privileged=true -e DB2INSTANCE=nhib -e DB2INST1_PASSWORD=nhib -e DBNAME=nhib -e LICENSE=accept -e AUTOCONFIG=false -e ARCHIVE_LOGS=false -p 50000:50000 -d icr.io/db2_community/db2:11.5.9.0
+              docker logs -f DB2 | sed '/(*) Setup has completed./ q'
+              docker exec DB2 su - nhib bash -c "db2 connect to nhib; db2 CREATE USER TEMPORARY TABLESPACE TEMPSPACE_32"
+
+              DB2_CLI_DRIVER_INSTALL_PATH="$(pwd)/src/NHibernate.Test/bin/Release/net8.0/clidriver"
+              echo "DB2LANG=en_US" >> $GITHUB_ENV
+              echo "DB2_CLI_DRIVER_INSTALL_PATH=$DB2_CLI_DRIVER_INSTALL_PATH" >> $GITHUB_ENV
+              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DB2_CLI_DRIVER_INSTALL_PATH/lib" >> $GITHUB_ENV
+              echo "LIBPATH=$LIBPATH:$DB2_CLI_DRIVER_INSTALL_PATH/lib" >> $GITHUB_ENV
+              echo "PATH=$DB2_CLI_DRIVER_INSTALL_PATH/bin:$DB2_CLI_DRIVER_INSTALL_PATH/adm:$PATH" >> $GITHUB_ENV
+
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.ALLOW_FAILURE == true}}
     env:

psake.ps1

@@ -87,6 +87,11 @@ Task Set-Configuration {
             'connection.connection_string' = 'User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))';
             'connection.driver_class' = 'NHibernate.Driver.OracleManagedDataClientDriver';
             'dialect' = 'NHibernate.Dialect.Oracle10gDialect'
+        };
+        'DB2' = @{
+            'connection.connection_string' = '';
+            'dialect' = 'NHibernate.Dialect.DB2Dialect';
+            'connection.driver_class' = 'NHibernate.Driver.DB2NetDriver'
         }
     }
     #Settings for current build

src/AsyncGenerator.yml

@@ -192,6 +192,7 @@
   applyChanges: true
   suppressDiagnosticFailures:
   - pattern: ^.*(Hql\.g).*$
+  - pattern: IBM.Data.Db2.dll
   analyzation:
     methodConversion:
     - conversion: Ignore

src/NHibernate.Test/Async/CacheTest/QueryCacheFixture.cs

@@ -87,14 +87,14 @@ public async Task QueryCacheWithScalarReturnAsync()
 			using (var s = OpenSession())
 			{
 				var result = await (s
-					.CreateSQLQuery("select cast(200012 as decimal) from Simple where id_ = 1")
+					.CreateSQLQuery("select cast(200012 as DECIMAL(18,5)) from Simple where id_ = 1")
 					.SetCacheable(true)
 					.UniqueResultAsync<decimal>());
 
 				Assert.That(result, Is.EqualTo(200012), "Unexpected non-cached result");
 
 				result = await (s
-					.CreateSQLQuery("select cast(200012 as decimal) from Simple where id_ = 1")
+					.CreateSQLQuery("select cast(200012 as DECIMAL(18,5)) from Simple where id_ = 1")
 					.SetCacheable(true)
 					.UniqueResultAsync<decimal>());
 

src/NHibernate.Test/Async/Criteria/Lambda/SubQueryIntegrationFixture.cs

@@ -171,8 +171,8 @@ public async Task SubQueryAsync()
 		[Test]
 		public async Task ThreeLevelSubqueryAsync()
 		{
-			if (!Dialect.SupportsScalarSubSelects)
-				Assert.Ignore("Dialect does not support scalar sub-select");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
 
 			Person p = null;
 			var detachedCriteria2 = DetachedCriteria.For<Person>("vf_inner_2")

src/NHibernate.Test/Async/Futures/FutureQueryFixture.cs

@@ -159,7 +159,12 @@ public async Task CanExecuteMultipleQueryWithSameParameterNameAsync()
 					string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
 					Assert.That(
 						wholeLog,
-						Does.Contain(paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]"));
+						Does.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]")
+						    .Or.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (4:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (4:0:0)]"));
 				}
 			}
 		}

src/NHibernate.Test/Async/Futures/LinqFutureFixture.cs

@@ -383,7 +383,12 @@ public async Task CanExecuteMultipleQueriesOnSameExpressionAsync()
 					string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
 					Assert.That(
 						wholeLog,
-						Does.Contain(paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]"));
+						Does.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]")
+						    .Or.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (4:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (4:0:0)]"));
 				}
 			}
 		}

src/NHibernate.Test/Async/Generatedkeys/Seqidentity/SequenceIdentityFixture.cs

@@ -34,7 +34,8 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 				// SAP HANA does not support a syntax allowing to return the inserted id as an output parameter or a return value
 				!(dialect is Dialect.HanaDialectBase) &&
 				// SQL Anywhere does not support a syntax allowing to return the inserted id as an output parameter or a return value
-				!(dialect is Dialect.SybaseSQLAnywhere10Dialect);
+				!(dialect is Dialect.SybaseSQLAnywhere10Dialect) &&
+				!(dialect is Dialect.DB2Dialect);
 		}
 
 		[Test]

src/NHibernate.Test/Async/IdGen/NativeGuid/NativeGuidFixture.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Collections;
 using NUnit.Framework;
 
@@ -27,6 +28,19 @@ protected override string[] Mappings
 			get { return new[] {"IdGen.NativeGuid.NativeGuidPoid.hbm.xml"}; }
 		}
 
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			try
+			{
+				var _ = dialect.SelectGUIDString;
+				return true;
+			}
+			catch (NotSupportedException)
+			{
+				return false;
+			}
+		}
+
 		[Test]
 		public async Task CrdAsync()
 		{
@@ -51,4 +65,4 @@ public async Task CrdAsync()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs

@@ -39,7 +39,7 @@ public async Task ReturnedValueIsGuidAsync()
 		{
 			try
 			{
-				var str = Dialect.Dialect.GetDialect().SelectGUIDString;	
+				var _ = sessions.Dialect.SelectGUIDString;	
 			}
 			catch (NotSupportedException)
 			{

src/NHibernate.Test/Async/Legacy/FooBarTest.cs

@@ -477,7 +477,7 @@ public async Task QueryAsync()
 			{
 				await (s.CreateQuery("from foo in class Foo where lower( foo.TheFoo.String ) = 'foo'").ListAsync());
 				await (s.CreateQuery("from foo in class Foo where lower( (foo.TheFoo.String || 'foo') || 'bar' ) = 'foo'").ListAsync());
-				await (s.CreateQuery("from foo in class Foo where repeat( (foo.TheFoo.STring || 'foo') || 'bar', 2 ) = 'foo'").ListAsync());
+				await (s.CreateQuery("from foo in class Foo where repeat( (foo.TheFoo.String || 'foo') || 'bar', 2 ) = 'foo'").ListAsync());
 				await (s.CreateQuery(
 					"From foo in class Bar where foo.TheFoo.Integer is not null and repeat( (foo.TheFoo.String || 'foo') || 'bar', (5+5)/2 ) = 'foo'")
 					.ListAsync());

src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs

@@ -526,8 +526,8 @@ public async Task OrdersWithSubquery11Async()
 		{
 			if (Dialect is MySQLDialect)
 				Assert.Ignore("MySQL does not support LIMIT in subqueries.");
-			if (Dialect is MsSqlCeDialect)
-				Assert.Ignore("MS SQL CE does not support sorting on a subquery.");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
 
 			var ordersQuery = db.Orders
 			                    .OrderByDescending(x => x.OrderLines.Count).ThenBy(x => x.OrderId)

src/NHibernate.Test/Async/NHSpecificTest/GH1921/Fixture.cs

@@ -49,7 +49,9 @@ protected override void OnTearDown()
 			using (var session = OpenSession())
 			using (var transaction = session.BeginTransaction())
 			{
-				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+				// Some dialects don't support multi-table deletes, so delete via in memory loading
+				session.Delete("from MultiTableEntity");
 
 				transaction.Commit();
 			}
@@ -142,6 +144,9 @@ public async Task MultiTableDmlInsertAsync(string filter)
 		[TestCase("OtherNameFilter")]
 		public async Task MultiTableDmlUpdateAsync(string filter)
 		{
+			if (!Dialect.SupportsTemporaryTables)
+				Assert.Ignore("Dialect does not support multi-table update");
+
 			var isFiltered = !string.IsNullOrEmpty(filter);
 
 			using (var session = OpenSession())
@@ -180,6 +185,9 @@ public async Task MultiTableDmlUpdateAsync(string filter)
 		[TestCase("OtherNameFilter")]
 		public async Task MultiTableDmlDeleteAsync(string filter)
 		{
+			if (!Dialect.SupportsTemporaryTables)
+				Assert.Ignore("Dialect does not support multi-table delete");
+
 			var isFiltered = !string.IsNullOrEmpty(filter);
 
 			using (var session = OpenSession())

src/NHibernate.Test/Async/NHSpecificTest/Logs/LogsFixture.cs

@@ -118,7 +118,10 @@ public async Task WillGetSessionIdFromConsecutiveSessionsLogsAsync()
 				for (var j = 0; j < 10; j++)
 				{
 					var sessionId = sessions[j].GetSessionImplementation().SessionId;
-					Assert.That(loggingEvent, Does.Contain($"p0 = {i * 10 + j} [Type: Int32 (0:0:0)] | SessionId: {sessionId}"));
+					Assert.That(
+						loggingEvent,
+						Does.Contain($"p0 = {i * 10 + j} [Type: Int32 (0:0:0)] | SessionId: {sessionId}")
+						    .Or.Contain($"p0 = {i * 10 + j} [Type: Int32 (4:0:0)] | SessionId: {sessionId}"));
 				}
 			}
 		}
@@ -138,7 +141,10 @@ public async Task WillGetSessionIdFromInterlacedSessionsLogsAsync()
 				for (var i = 0; i < interceptor.SessionIds.Count; i++)
 				{
 					var sessionId = interceptor.SessionIds[i];
-					Assert.That(loggingEvent, Does.Contain($"p0 = {i + 1} [Type: Int32 (0:0:0)] | SessionId: {sessionId}"));
+					Assert.That(
+						loggingEvent,
+						Does.Contain($"p0 = {i + 1} [Type: Int32 (0:0:0)] | SessionId: {sessionId}")
+						    .Or.Contain(($"p0 = {i + 1} [Type: Int32 (4:0:0)] | SessionId: {sessionId}")));
 				}
 				Assert.That(loggingEvent, Does.Contain($"Person person0_ | SessionId: {s.GetSessionImplementation().SessionId}"));
 			}
@@ -205,7 +211,10 @@ public async Task WillGetSessionIdFromSessionLogsConcurrentAsync()
 				for (var j = 0; j < 10; j++)
 				{
 					var sessionId = sessionIds[i];
-					Assert.That(loggingEvent, Does.Contain($"p0 = {i * 10 + j} [Type: Int32 (0:0:0)] | SessionId: {sessionId}"));
+					Assert.That(
+						loggingEvent,
+						Does.Contain($"p0 = {i * 10 + j} [Type: Int32 (0:0:0)] | SessionId: {sessionId}")
+						    .Or.Contain($"p0 = {i * 10 + j} [Type: Int32 (4:0:0)] | SessionId: {sessionId}"));
 				}
 			}
 		}

src/NHibernate.Test/Async/NHSpecificTest/NH1280/NH1280Fixture.cs

@@ -228,9 +228,8 @@ public async Task NestedSubqueriesShouldStayInOrderAsync()
 		[Test]
 		public async Task SubstringShouldUseAllParametersAsync()
 		{
-			// https://technet.microsoft.com/en-us/library/ms174077(v=sql.110).aspx
-			if (Dialect is MsSqlCeDialect)
-				Assert.Ignore("Sql function left not supported by MS SQL CE");
+			if (!Dialect.Functions.ContainsKey("left"))
+				Assert.Ignore($"Sql function left not is supported by {Dialect}");
 
 			using (ISession s = OpenSession())
 			using (ITransaction tx = s.BeginTransaction())

src/NHibernate.Test/Async/NHSpecificTest/NH3426/Fixture.cs

@@ -160,7 +160,7 @@ public async Task SelectGuidToStringImplicitAsync()
 			if (Dialect is SQLiteDialect && _useBinaryGuid)
 				Assert.Ignore("Fails with BinaryGuid=True due to GH-2109. (2019-04-09).");
 
-			if (Dialect is FirebirdDialect || Dialect is MySQLDialect || Dialect is Oracle8iDialect)
+			if (Dialect is FirebirdDialect or MySQLDialect || Dialect is Oracle8iDialect || Dialect is DB2Dialect)
 				Assert.Ignore("Since strguid() is not applied, it fails on Firebird, MySQL and Oracle " +
 							"because a simple cast cannot be used for GUID to string conversion on " +
 							"these dialects. See GH-2109.");
@@ -184,7 +184,7 @@ public async Task WhereGuidToStringImplicitAsync()
 			if (Dialect is SQLiteDialect && _useBinaryGuid)
 				Assert.Ignore("Fails with BinaryGuid=True due to GH-2109. (2019-04-09).");
 
-			if (Dialect is FirebirdDialect || Dialect is MySQLDialect || Dialect is Oracle8iDialect)
+			if (Dialect is FirebirdDialect || Dialect is MySQLDialect || Dialect is Oracle8iDialect || Dialect is DB2Dialect)
 				Assert.Ignore("Since strguid() is not applied, it fails on Firebird, MySQL and Oracle " +
 							"because a simple cast cannot be used for GUID to string conversion on " +
 							"these dialects. See GH-2109.");

src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs

@@ -148,8 +148,8 @@ public async Task AggregatingHirearchyWithCountAsync()
         [Test]
         public async Task LimitingResultSetOnQueryThatIsOrderedByProjectionAsync()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+           	if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using(var s = OpenSession())
             {
@@ -172,8 +172,8 @@ public async Task LimitingResultSetOnQueryThatIsOrderedByProjectionAsync()
         [Test]
         public async Task QueryingWithParemetersAndParaemtersInOrderByAsync()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+           	if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using (var s = OpenSession())
             {

src/NHibernate.Test/CacheTest/QueryCacheFixture.cs

@@ -76,14 +76,14 @@ public void QueryCacheWithScalarReturn()
 			using (var s = OpenSession())
 			{
 				var result = s
-					.CreateSQLQuery("select cast(200012 as decimal) from Simple where id_ = 1")
+					.CreateSQLQuery("select cast(200012 as DECIMAL(18,5)) from Simple where id_ = 1")
 					.SetCacheable(true)
 					.UniqueResult<decimal>();
 
 				Assert.That(result, Is.EqualTo(200012), "Unexpected non-cached result");
 
 				result = s
-					.CreateSQLQuery("select cast(200012 as decimal) from Simple where id_ = 1")
+					.CreateSQLQuery("select cast(200012 as DECIMAL(18,5)) from Simple where id_ = 1")
 					.SetCacheable(true)
 					.UniqueResult<decimal>();
 

src/NHibernate.Test/Criteria/Lambda/SubQueryIntegrationFixture.cs

@@ -160,8 +160,8 @@ public void SubQuery()
 		[Test]
 		public void ThreeLevelSubquery()
 		{
-			if (!Dialect.SupportsScalarSubSelects)
-				Assert.Ignore("Dialect does not support scalar sub-select");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
 
 			Person p = null;
 			var detachedCriteria2 = DetachedCriteria.For<Person>("vf_inner_2")

src/NHibernate.Test/Futures/FutureQueryFixture.cs

@@ -148,7 +148,12 @@ public void CanExecuteMultipleQueryWithSameParameterName()
 					string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
 					Assert.That(
 						wholeLog,
-						Does.Contain(paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]"));
+						Does.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]")
+						    .Or.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (4:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (4:0:0)]"));
 				}
 			}
 		}

src/NHibernate.Test/Futures/LinqFutureFixture.cs

@@ -372,7 +372,12 @@ public void CanExecuteMultipleQueriesOnSameExpression()
 					string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
 					Assert.That(
 						wholeLog,
-						Does.Contain(paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]"));
+						Does.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (0:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (0:0:0)]")
+						    .Or.Contain(
+							    paramPrefix + "p0 = 1 [Type: Int32 (4:0:0)], " + 
+							    paramPrefix + "p1 = 2 [Type: Int32 (4:0:0)]"));
 				}
 			}
 		}

src/NHibernate.Test/Generatedkeys/Seqidentity/SequenceIdentityFixture.cs

@@ -23,7 +23,8 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 				// SAP HANA does not support a syntax allowing to return the inserted id as an output parameter or a return value
 				!(dialect is Dialect.HanaDialectBase) &&
 				// SQL Anywhere does not support a syntax allowing to return the inserted id as an output parameter or a return value
-				!(dialect is Dialect.SybaseSQLAnywhere10Dialect);
+				!(dialect is Dialect.SybaseSQLAnywhere10Dialect) &&
+				!(dialect is Dialect.DB2Dialect);
 		}
 
 		[Test]

src/NHibernate.Test/IdGen/NativeGuid/NativeGuidFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using NUnit.Framework;
 
@@ -16,6 +17,19 @@ protected override string[] Mappings
 			get { return new[] {"IdGen.NativeGuid.NativeGuidPoid.hbm.xml"}; }
 		}
 
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			try
+			{
+				var _ = dialect.SelectGUIDString;
+				return true;
+			}
+			catch (NotSupportedException)
+			{
+				return false;
+			}
+		}
+
 		[Test]
 		public void Crd()
 		{
@@ -40,4 +54,4 @@ public void Crd()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs

@@ -27,7 +27,7 @@ public void ReturnedValueIsGuid()
 		{
 			try
 			{
-				var str = Dialect.Dialect.GetDialect().SelectGUIDString;	
+				var _ = sessions.Dialect.SelectGUIDString;	
 			}
 			catch (NotSupportedException)
 			{