NH-3919 - Firebird "fix", to be squashed

Author: fredericDelaporte

src/NHibernate.Test/Async/TypesTest/DateTimeTypeFixture.cs

@@ -40,17 +40,15 @@ public async Task NextAsync()
 			object current = DateTime.Parse("2004-01-01");
 			object next = await (type.NextAsync(current, null, CancellationToken.None));
 
-			Assert.IsTrue(next is DateTime, "Next should be DateTime");
-			Assert.IsTrue(
-				(DateTime) next > (DateTime) current,
-				"next should be greater than current (could be equal depending on how quickly this occurs)");
+			Assert.That(next, Is.TypeOf<DateTime>(), "next should be DateTime");
+			Assert.That(next, Is.GreaterThan(current), "next should be greater than current");
 		}
 
 		[Test]
 		public async Task SeedAsync()
 		{
 			var type = NHibernateUtil.DateTime;
-			Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is DateTime, "seed should be DateTime");
+			Assert.That(await (type.SeedAsync(null, CancellationToken.None)), Is.TypeOf<DateTime>(), "seed should be DateTime");
 		}
 	}
 
@@ -137,7 +135,7 @@ public async Task SaveUseExpectedSqlTypeAsync()
 				await (t.CommitAsync());
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 3);
 		}
 
 		[Test]
@@ -156,12 +154,15 @@ public async Task UpdateUseExpectedSqlTypeAsync()
 				await (t.CommitAsync());
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 3);
 		}
 
 		[Test]
 		public async Task QueryUseExpectedSqlTypeAsync()
 		{
+			if (!TestDialect.SupportsNonDataBoundCondition)
+				Assert.Ignore("Dialect does not support the test query");
+
 			var driver = (ClientDriverWithParamsStats) Sfi.ConnectionProvider.Driver;
 
 			using (var s = OpenSession())
@@ -182,10 +183,10 @@ public async Task QueryUseExpectedSqlTypeAsync()
 				await (t.CommitAsync());
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 5);
 		}
 
-		private void AssertSqlType(ClientDriverWithParamsStats driver)
+		private void AssertSqlType(ClientDriverWithParamsStats driver, int expectedCount)
 		{
 			if (NHibernateUtil.DateTime.SqlTypes(Sfi).Any(t => Equals(t, SqlTypeFactory.DateTime2)))
 			{
@@ -198,7 +199,10 @@ private void AssertSqlType(ClientDriverWithParamsStats driver)
 					Is.GreaterThan(0),
 					"Missing SqlTypeFactory.DateTime2 usages.");
 				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(0), "Found unexpected DbType.DateTime usages.");
-				Assert.That(driver.GetCount(DbType.DateTime2), Is.GreaterThan(0), "Missing DbType.DateTime2 usages.");
+				Assert.That(
+					driver.GetCount(DbType.DateTime2),
+					Is.EqualTo(expectedCount),
+					"Unexpected DbType.DateTime2 usage count.");
 			}
 			else
 			{
@@ -211,7 +215,7 @@ private void AssertSqlType(ClientDriverWithParamsStats driver)
 					Is.GreaterThan(0),
 					"Missing SqlTypeFactory.DateTime usages.");
 				Assert.That(driver.GetCount(DbType.DateTime2), Is.EqualTo(0), "Found unexpected DbType.DateTime2 usages.");
-				Assert.That(driver.GetCount(DbType.DateTime), Is.GreaterThan(0), "Missing DbType.DateTime usages.");
+				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(expectedCount), "Unexpected DbType.DateTime usage count.");
 			}
 		}
 	}

src/NHibernate.Test/TestDialect.cs

@@ -55,6 +55,11 @@ public TestDialect(Dialect.Dialect dialect)
 		/// </summary>
 		public virtual bool SupportsEmptyInserts => true;
 
+		/// <summary>
+		/// Supports condition not bound to any data, like "where @p1 = @p2".
+		/// </summary>
+		public virtual bool SupportsNonDataBoundCondition => true;
+
 		public bool SupportsSqlType(SqlType sqlType)
 		{
 			try

src/NHibernate.Test/TestDialects/FirebirdTestDialect.cs

@@ -7,5 +7,6 @@ public FirebirdTestDialect(Dialect.Dialect dialect) : base(dialect)
 		}
 
 		public override bool SupportsComplexExpressionInGroupBy => false;
+		public override bool SupportsNonDataBoundCondition => false;
 	}
 }

src/NHibernate.Test/TypesTest/DateTimeTypeFixture.cs

@@ -148,7 +148,7 @@ public void SaveUseExpectedSqlType()
 				t.Commit();
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 3);
 		}
 
 		[Test]
@@ -167,12 +167,15 @@ public void UpdateUseExpectedSqlType()
 				t.Commit();
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 3);
 		}
 
 		[Test]
 		public void QueryUseExpectedSqlType()
 		{
+			if (!TestDialect.SupportsNonDataBoundCondition)
+				Assert.Ignore("Dialect does not support the test query");
+
 			var driver = (ClientDriverWithParamsStats) Sfi.ConnectionProvider.Driver;
 
 			using (var s = OpenSession())
@@ -193,10 +196,10 @@ public void QueryUseExpectedSqlType()
 				t.Commit();
 			}
 
-			AssertSqlType(driver);
+			AssertSqlType(driver, 5);
 		}
 
-		private void AssertSqlType(ClientDriverWithParamsStats driver)
+		private void AssertSqlType(ClientDriverWithParamsStats driver, int expectedCount)
 		{
 			if (NHibernateUtil.DateTime.SqlTypes(Sfi).Any(t => Equals(t, SqlTypeFactory.DateTime2)))
 			{
@@ -209,7 +212,10 @@ private void AssertSqlType(ClientDriverWithParamsStats driver)
 					Is.GreaterThan(0),
 					"Missing SqlTypeFactory.DateTime2 usages.");
 				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(0), "Found unexpected DbType.DateTime usages.");
-				Assert.That(driver.GetCount(DbType.DateTime2), Is.GreaterThan(0), "Missing DbType.DateTime2 usages.");
+				Assert.That(
+					driver.GetCount(DbType.DateTime2),
+					Is.EqualTo(expectedCount),
+					"Unexpected DbType.DateTime2 usage count.");
 			}
 			else
 			{
@@ -222,7 +228,7 @@ private void AssertSqlType(ClientDriverWithParamsStats driver)
 					Is.GreaterThan(0),
 					"Missing SqlTypeFactory.DateTime usages.");
 				Assert.That(driver.GetCount(DbType.DateTime2), Is.EqualTo(0), "Found unexpected DbType.DateTime2 usages.");
-				Assert.That(driver.GetCount(DbType.DateTime), Is.GreaterThan(0), "Missing DbType.DateTime usages.");
+				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(expectedCount), "Unexpected DbType.DateTime usage count.");
 			}
 		}
 	}