NH-1752 - NHibernate Date type converts to NULL

build-common/nhibernate-properties.xml

@@ -2,6 +2,6 @@
 <project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
 	<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2008Dialect"  overwrite="false"/>
 	<property name="nhibernate.command_timeout" value="444"  overwrite="false"/>
-	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.SqlClientDriver" overwrite="false"/>
+	<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.Sql2008ClientDriver" overwrite="false"/>
 	<property name="nhibernate.connection.connection_string" value="Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI" overwrite="false"/>
 </project>

build-common/teamcity-hibernate.cfg.xml

@@ -15,7 +15,7 @@
 			<property name="format_sql">true</property>
 
 			<!-- This is the System.Data.dll provider for MSSQL Server -->
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 			<property name="connection.connection_string">Server=.\SQLExpress;initial catalog=nhibernate;Integrated Security=SSPI</property>
 			<property name="show_sql">false</property>

doc/reference/modules/configuration.xml

@@ -1002,12 +1002,6 @@ ISession session = sessions.OpenSession(conn);
   <session-factory>
 
     <!-- properties -->
-    <property name="connection.provider">
-      NHibernate.Connection.DriverConnectionProvider
-      </property>
-    <property name="connection.driver_class">
-      NHibernate.Driver.SqlClientDriver
-    </property>
     <property name="connection.connection_string">
       Server=localhost;initial catalog=nhibernate;User Id=;Password=
     </property>

doc/reference/modules/example_weblog.xml

@@ -333,9 +333,6 @@ namespace Eg
   <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
     <session-factory>
       <property name="dialect">NHibernate.Dialect.MsSql2012Dialect</property>
-      <property name="connection.provider">
-        NHibernate.Connection.DriverConnectionProvider
-      </property>
       <property name="connection.connection_string">
         Server=localhost\SQLEXPRESS;initial catalog=Eg;Integrated Security=True
       </property>

doc/reference/modules/quickstart.xml

@@ -52,9 +52,6 @@
   <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
     <session-factory>
       <property name="dialect">NHibernate.Dialect.MsSql2012Dialect</property>
-      <property name="connection.provider">
-        NHibernate.Connection.DriverConnectionProvider
-      </property>
       <property name="connection.connection_string">
         Server=localhost\SQLEXPRESS;initial catalog=quickstart;Integrated Security=True
       </property>

src/NHibernate.Config.Templates/MSSQL.cfg.xml

@@ -7,10 +7,10 @@ for your own use before compile tests in VisualStudio.
 <!-- This is the System.Data.dll provider for SQL Server -->
 <hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
 	<session-factory name="NHibernate.Test">
-		<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+		<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property>
 		<property name="connection.connection_string">
 			Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
 		</property>
 		<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 	</session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

src/NHibernate.Example.Web/Infrastructure/AppSessionFactory.cs

@@ -24,7 +24,7 @@ public AppSessionFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFacto
 				{
 					db.ConnectionString = @"Server=(local)\SQLEXPRESS;initial catalog=nhibernate;Integrated Security=true";
 					db.Dialect<MsSql2008Dialect>();
-					db.Driver<SqlClientDriver>();
+					db.Driver<Sql2008ClientDriver>();
 				})
 				.AddMapping(domainMapping);
 			Configuration.SessionFactory().GenerateStatistics();
@@ -37,4 +37,4 @@ public ISession OpenSession()
 			return SessionFactory.OpenSession();
 		}
 	}
-}
+}

src/NHibernate.Test/App.config

@@ -30,7 +30,7 @@
 
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 
-			<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
+			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
 			<property name="connection.connection_string_name">TestConnectionString</property>
 			<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
 			<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->

src/NHibernate.Test/Async/FilterTest/DynamicFilterTest.cs

@@ -773,4 +773,4 @@ public void Dispose()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/Hql/Ast/LimitClauseFixture.cs

@@ -10,7 +10,9 @@
 
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.Driver;
 using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Hql.Ast
@@ -22,7 +24,8 @@ public class LimitClauseFixtureAsync : BaseFixture
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect.SupportsVariableLimit
-				&& !(Dialect is Dialect.MsSql2000Dialect &&  cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
+				&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
+					typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)))); 
 		}
 
 		protected override void OnSetUp()
@@ -186,4 +189,4 @@ public async Task TakeWithParameterAsync()
 			s.Close();
 		}
 	}
-}
+}

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

@@ -12,6 +12,7 @@
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1144
@@ -36,7 +37,7 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public async Task CanSaveInSingleBatchAsync()
 		{
-			if (configuration.Properties[Environment.ConnectionDriver].Contains(typeof (OracleDataClientDriver).Name) == false)
+			if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 			{
 				Assert.Ignore("Only applicable for Oracle Data Client driver");
 			}
@@ -85,4 +86,4 @@ public async Task CanSaveInSingleBatchAsync()
 			Assert.IsTrue(executedBatch);
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH2207/SampleTest.cs

@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Data;
+using NHibernate.Dialect;
+using NHibernate.Driver;
+using NHibernate.Engine;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2207
+{
+	using System.Threading.Tasks;
+	using System.Threading;
+	[TestFixture]
+	public class SampleTestAsync : BugTestCase
+	{
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2008Dialect;
+		}
+
+		protected override bool AppliesTo(ISessionFactoryImplementor factory)
+		{
+			return factory.ConnectionProvider.Driver is Sql2008ClientDriver;
+		}
+
+		[Test]
+		public async Task WithoutUseNHSqlDataProviderWorkProperlyAsync()
+		{
+			var createTable = "CREATE TABLE TryDate([Id] [int] IDENTITY(1,1) NOT NULL,[MyDate] [date] NOT NULL)";
+			var dropTable = "DROP TABLE TryDate";
+			var insertTable = "INSERT INTO TryDate([MyDate]) VALUES(@p0)";
+			using(var sqlConnection = new System.Data.SqlClient.SqlConnection(cfg.Properties[Cfg.Environment.ConnectionString]))
+			{
+				await (sqlConnection.OpenAsync(CancellationToken.None));
+				using (var tx = sqlConnection.BeginTransaction())
+				{
+					var command = sqlConnection.CreateCommand();
+					command.Transaction = tx;
+					command.CommandText = createTable;
+					await (command.ExecuteNonQueryAsync(CancellationToken.None));
+					tx.Commit();
+				}
+
+				try
+				{
+					using (var tx = sqlConnection.BeginTransaction())
+					{
+						var command = sqlConnection.CreateCommand();
+						command.Transaction = tx;
+						command.CommandText = insertTable;
+						var dateParam = command.CreateParameter();
+						dateParam.ParameterName = "@p0";
+						dateParam.DbType = DbType.Date;
+						dateParam.SqlDbType = SqlDbType.Date;
+						dateParam.Value = DateTime.MinValue.Date;
+						command.Parameters.Add(dateParam);
+						await (command.ExecuteNonQueryAsync(CancellationToken.None));
+						tx.Commit();
+					}
+				}
+				finally
+				{
+					using (var tx = sqlConnection.BeginTransaction())
+					{
+						var command = sqlConnection.CreateCommand();
+						command.Transaction = tx;
+						command.CommandText = dropTable;
+						await (command.ExecuteNonQueryAsync(CancellationToken.None));
+						tx.Commit();
+					}
+				}
+			}
+		}
+
+		[Test]
+		public async Task Dates_Before_1753_Should_Not_Insert_NullAsync()
+		{
+			object savedId;
+			var expectedStoredValue = DateTime.MinValue.Date.AddDays(1).Date;
+			using (ISession session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var concrete = new DomainClass{Date = expectedStoredValue.AddMinutes(90)};
+				savedId = await (session.SaveAsync(concrete));
+				await (tx.CommitAsync());
+			}
+
+			using (ISession session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var savedObj = await (session.GetAsync<DomainClass>(savedId));
+				Assert.That(savedObj.Date, Is.EqualTo(expectedStoredValue));
+				await (session.DeleteAsync(savedObj));
+				await (tx.CommitAsync());
+			}
+		}
+	}
+}

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

@@ -13,6 +13,7 @@
 using NHibernate.Cfg;
 using NHibernate.Dialect;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3202
@@ -26,7 +27,7 @@ protected override void Configure(Configuration configuration)
 			if (!(Dialect is MsSql2008Dialect))
 				Assert.Ignore("Test is for MS SQL Server dialect only (custom dialect).");
 
-			if (!Environment.ConnectionDriver.Contains("SqlClientDriver"))
+			if (!typeof(SqlClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 				Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
 
 			cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);

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

@@ -0,0 +1,97 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Collections.Generic;
+using NHibernate.Dialect;
+using NHibernate.Type;
+using NUnit.Framework;
+using System;
+
+namespace NHibernate.Test.TypesTest
+{
+	using System.Threading.Tasks;
+	using System.Threading;
+
+	[TestFixture]
+	public class DateTypeFixtureAsync : TypeFixtureBase
+	{
+		protected override string TypeName
+		{
+			get { return "Date"; }
+		}
+
+		[Test]
+		public Task ReadWriteNormalAsync()
+		{
+			try
+			{
+				var expected = DateTime.Today;
+
+				return ReadWriteAsync(expected);
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+
+		[Test]
+		public Task ReadWriteMinAsync()
+		{
+			try
+			{
+				var expected = Sfi.ConnectionProvider.Driver.MinDate;
+
+				return ReadWriteAsync(expected);
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+
+		[Test]
+		public Task ReadWriteYear750Async()
+		{
+			try
+			{
+				var expected = new DateTime(750, 5, 13);
+				if (Sfi.ConnectionProvider.Driver.MinDate > expected)
+				{
+					Assert.Ignore($"The driver does not support dates below {Sfi.ConnectionProvider.Driver.MinDate:O}");
+				}
+				return ReadWriteAsync(expected);
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<object>(ex);
+			}
+		}
+
+		private async Task ReadWriteAsync(DateTime expected, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			// Add an hour to check it is correctly ignored once read back from db.
+			var basic = new DateClass { DateValue = expected.AddHours(1) };
+			object savedId;
+			using (var s = OpenSession())
+			{
+				savedId = await (s.SaveAsync(basic, cancellationToken)); 
+				await (s.FlushAsync(cancellationToken));
+			}
+			using (var s = OpenSession())
+			{
+				basic = await (s.GetAsync<DateClass>(savedId, cancellationToken));
+				Assert.That(basic.DateValue, Is.EqualTo(expected));
+				await (s.DeleteAsync(basic, cancellationToken));
+				await (s.FlushAsync(cancellationToken));
+			}
+		}
+	}
+}