NH-3919 - Handle date and time scale.

Author: fredericDelaporte

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

@@ -247,7 +247,7 @@ public virtual async Task SaveUseExpectedSqlTypeAsync()
 			}
 
 			// 2 properties + revision
-			AssertSqlType(driver, 3);
+			AssertSqlType(driver, 3, true);
 		}
 
 		[Test]
@@ -266,7 +266,7 @@ public virtual async Task UpdateUseExpectedSqlTypeAsync()
 			}
 
 			// 2 properties + revision x 2 (check + update)
-			AssertSqlType(driver, 4);
+			AssertSqlType(driver, 4, true);
 		}
 
 		[Test]
@@ -296,41 +296,65 @@ public virtual async Task QueryUseExpectedSqlTypeAsync()
 				await (t.CommitAsync());
 			}
 
-			AssertSqlType(driver, 5);
+			AssertSqlType(driver, 5, false);
+
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var q = s
+					.CreateQuery(
+						"from DateTimeClass d where d.Value = :value and " +
+						"d.NullableValue = :nullableValue and " +
+						"d.Revision = :revision and " +
+						":other1 = :other2")
+					.SetParameter("value", Now, Type)
+					.SetParameter("nullableValue", Now, Type)
+					.SetParameter("revision", Now, Type)
+					.SetParameter("other1", Now, Type)
+					.SetParameter("other2", Now, Type);
+				driver.ClearStats();
+				await (q.ListAsync<DateTimeClass>());
+				await (t.CommitAsync());
+			}
+
+			AssertSqlType(driver, 5, true);
 		}
 
-		private void AssertSqlType(ClientDriverWithParamsStats driver, int expectedCount)
+		private void AssertSqlType(ClientDriverWithParamsStats driver, int expectedCount, bool exactType)
 		{
-			if (Type.SqlTypes(Sfi).Any(t => Equals(t, SqlTypeFactory.DateTime2)))
+			var typeSqlTypes = Type.SqlTypes(Sfi);
+			if (typeSqlTypes.Any(t => t is DateTime2SqlType))
 			{
+				var expectedType = exactType ? typeSqlTypes.First(t => t is DateTime2SqlType) : SqlTypeFactory.DateTime2;
 				Assert.That(
 					driver.GetCount(SqlTypeFactory.DateTime),
 					Is.EqualTo(0),
 					"Found unexpected SqlTypeFactory.DateTime usages.");
 				Assert.That(
-					driver.GetCount(SqlTypeFactory.DateTime2),
+					driver.GetCount(expectedType),
 					Is.EqualTo(expectedCount),
 					"Unexpected SqlTypeFactory.DateTime2 usage count.");
 				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(0), "Found unexpected DbType.DateTime usages.");
 				Assert.That(
-					driver.GetCount(DbType.DateTime2),
+					driver.GetCount(expectedType),
 					Is.EqualTo(expectedCount),
 					"Unexpected DbType.DateTime2 usage count.");
 			}
-			else if (Type.SqlTypes(Sfi).Any(t => Equals(t, SqlTypeFactory.DateTime)))
+			else if (typeSqlTypes.Any(t => t is DateTimeSqlType))
 			{
+				var expectedType = exactType ? typeSqlTypes.First(t => t is DateTimeSqlType) : SqlTypeFactory.DateTime;
 				Assert.That(
 					driver.GetCount(SqlTypeFactory.DateTime2),
 					Is.EqualTo(0),
 					"Found unexpected SqlTypeFactory.DateTime2 usages.");
 				Assert.That(
-					driver.GetCount(SqlTypeFactory.DateTime),
+					driver.GetCount(expectedType),
 					Is.EqualTo(expectedCount),
 					"Unexpected SqlTypeFactory.DateTime usage count.");
 				Assert.That(driver.GetCount(DbType.DateTime2), Is.EqualTo(0), "Found unexpected DbType.DateTime2 usages.");
-				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(expectedCount), "Unexpected DbType.DateTime usage count.");
+				Assert.That(driver.GetCount(expectedType), Is.EqualTo(expectedCount), "Unexpected DbType.DateTime usage count.");
 			}
-			else if (Type.SqlTypes(Sfi).Any(t => Equals(t, SqlTypeFactory.Date)))
+			else if (typeSqlTypes.Any(t => Equals(t, SqlTypeFactory.Date)))
 			{
 				Assert.That(
 					driver.GetCount(SqlTypeFactory.DateTime),
@@ -343,6 +367,10 @@ private void AssertSqlType(ClientDriverWithParamsStats driver, int expectedCount
 				Assert.That(driver.GetCount(DbType.DateTime), Is.EqualTo(0), "Found unexpected DbType.DateTime usages.");
 				Assert.That(driver.GetCount(DbType.Date), Is.EqualTo(expectedCount), "Unexpected DbType.Date usage count.");
 			}
+			else
+			{
+				Assert.Ignore("Test does not involve tested types");
+			}
 		}
 
 		protected virtual long DateAccuracyInTicks => Dialect.TimestampResolutionInTicks;

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

@@ -9,35 +9,44 @@
 
 
 using System;
+using NHibernate.Driver;
+using NHibernate.SqlTypes;
 using NHibernate.Type;
 using NUnit.Framework;
 
 namespace NHibernate.Test.TypesTest
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	/// <summary>
 	/// TestFixtures for the <see cref="DateTimeType"/>.
 	/// </summary>
 	[TestFixture]
 	[Obsolete]
-	public class DateTime2TypeFixtureAsync
+	public class DateTime2TypeFixtureAsync : AbstractDateTimeTypeFixtureAsync
 	{
-		[Test]
-		public async Task NextAsync()
-		{
-			var type = NHibernateUtil.DateTime2;
-			object current = DateTime.Now.AddMilliseconds(-1);
-			object next = await (type.NextAsync(current, null, CancellationToken.None));
-
-			Assert.That(next, Is.TypeOf<DateTime>().And.GreaterThan(current));
-		}
-
-		[Test]
-		public async Task SeedAsync()
-		{
-			var type = NHibernateUtil.DateTime2;
-			Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is DateTime, "seed should be DateTime");
-		}
+		protected override bool AppliesTo(Dialect.Dialect dialect) =>
+			TestDialect.SupportsSqlType(SqlTypeFactory.DateTime2);
+
+		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory) =>
+			// Cannot handle DbType.DateTime2 via .Net ODBC.
+			!(factory.ConnectionProvider.Driver is OdbcDriver);
+
+		protected override string TypeName => "DateTime2";
+		protected override AbstractDateTimeType Type => NHibernateUtil.DateTime2;
+	}
+
+	[TestFixture]
+	[Obsolete]
+	public class DateTime2TypeWithScaleFixtureAsync : DateTimeTypeWithScaleFixtureAsync
+	{
+		protected override bool AppliesTo(Dialect.Dialect dialect) =>
+			TestDialect.SupportsSqlType(SqlTypeFactory.DateTime2);
+
+		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory) =>
+			// Cannot handle DbType.DateTime2 via .Net ODBC.
+			!(factory.ConnectionProvider.Driver is OdbcDriver);
+
+		protected override string TypeName => "DateTime2WithScale";
+		protected override AbstractDateTimeType Type => (AbstractDateTimeType)TypeFactory.GetDateTime2Type(3);
 	}
 }