NH-3884 - Allow redefining the NHibernate default type for a .Net type.

Author: fredericDelaporte

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1,26 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../build-common/NHibernate.props" />
-
   <PropertyGroup>
     <Description>The Unit Tests for NHibernate.</Description>
-
     <TargetFramework>net461</TargetFramework>
     <NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
   </PropertyGroup>
-
   <ItemGroup>
     <None Remove="**\*.hbm.xml" />
     <None Remove="**\*.jpg" />
     <None Update="DbScripts\*.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="**\*.hbm.xml" Exclude="bin\**\*.*" />
     <EmbeddedResource Include="**\*.jpg" />
@@ -32,13 +27,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="..\NHibernate.DomainModel\ABC.hbm.xml" Link="ABC.hbm.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
     <PackageReference Include="Iesi.Collections" Version="4.0.2" />
@@ -51,20 +44,16 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NHibernate.DomainModel\NHibernate.DomainModel.csproj" />
     <ProjectReference Include="..\NHibernate\NHibernate.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Transactions" />
   </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
-</Project>
+</Project>

src/NHibernate.Test/TypesTest/ChangeDefaultTypeClass.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.TypesTest
+{
+	public class ChangeDefaultTypeClass
+	{
+		public int Id { get; set; }
+
+		public DateTime NormalDateTimeValue { get; set; } = DateTime.Today;
+	}
+}

src/NHibernate.Test/TypesTest/ChangeDefaultTypeClass.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="false">
+
+  <class
+    name="NHibernate.Test.TypesTest.ChangeDefaultTypeClass, NHibernate.Test"
+    table="bc_datetime"
+  >
+
+    <id name="Id" column="id">
+      <generator class="assigned"/>
+    </id>
+
+    <property name="NormalDateTimeValue"/>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/TypesTest/ChangeDefaultTypeFixture.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using NHibernate.Cfg;
+using NHibernate.Engine;
+using NHibernate.Impl;
+using NHibernate.Type;
+using NUnit.Framework;
+
+namespace NHibernate.Test.TypesTest
+{
+	/// <summary>
+	/// TestFixtures for changing a default .Net type.
+	/// </summary>
+	[TestFixture]
+	public class ChangeDefaultTypeFixture : TypeFixtureBase
+	{
+		protected override string TypeName => "ChangeDefaultType";
+
+		private IType _originalDefaultDateTimeType;
+		private IType _testDefaultDateTimeType;
+
+		protected override void Configure(Configuration configuration)
+		{
+			_originalDefaultDateTimeType = TypeFactory.GetDefaultTypeFor(typeof(DateTime));
+			Assert.That(_originalDefaultDateTimeType, Is.Not.Null);
+			_testDefaultDateTimeType = NHibernateUtil.DateTime.Equals(_originalDefaultDateTimeType)
+				? (IType) NHibernateUtil.Timestamp
+				: NHibernateUtil.DateTime;
+			TypeFactory.SetDefaultType<DateTime>(_testDefaultDateTimeType);
+			base.Configure(configuration);
+		}
+
+		protected override void DropSchema()
+		{
+			base.DropSchema();
+			if (_originalDefaultDateTimeType != null)
+				TypeFactory.SetDefaultType<DateTime>(_originalDefaultDateTimeType);
+		}
+
+		[Test]
+		public void DefaultType()
+		{
+			Assert.That(TypeFactory.GetDefaultTypeFor(typeof(DateTime)), Is.EqualTo(_testDefaultDateTimeType));
+		}
+
+		[Test]
+		public void PropertyType()
+		{
+			Assert.That(
+				Sfi.GetClassMetadata(typeof(ChangeDefaultTypeClass))
+				   .GetPropertyType(nameof(ChangeDefaultTypeClass.NormalDateTimeValue)),
+				Is.EqualTo(_testDefaultDateTimeType));
+		}
+
+		[Test]
+		public void GuessType()
+		{
+			Assert.That(NHibernateUtil.GuessType(typeof(DateTime)), Is.EqualTo(_testDefaultDateTimeType));
+		}
+
+		[Test]
+		public void ParameterType()
+		{
+			var namedParametersField = typeof(AbstractQueryImpl)
+				.GetField("namedParameters", BindingFlags.Instance | BindingFlags.NonPublic);
+			Assert.That(namedParametersField, Is.Not.Null, "Missing internal field");
+
+			using (var s = OpenSession())
+			{
+				// Query where the parameter type cannot be deducted from compared entity property
+				var q = s.CreateQuery($"from {nameof(ChangeDefaultTypeClass)} where :date1 = :date2 or :date1 = :date3")
+				         .SetParameter("date1", DateTime.Now)
+				         .SetDateTime("date2", DateTime.Now)
+				         .SetTimestamp("date3", DateTime.Now);
+
+				var namedParameters = namedParametersField.GetValue(q) as Dictionary<string, TypedValue>;
+				Assert.That(namedParameters, Is.Not.Null, "Unable to retrieve parameters internal field");
+				Assert.That(namedParameters["date1"].Type, Is.EqualTo(_testDefaultDateTimeType));
+				Assert.That(namedParameters["date2"].Type, Is.EqualTo(NHibernateUtil.DateTime));
+				Assert.That(namedParameters["date3"].Type, Is.EqualTo(NHibernateUtil.Timestamp));
+			}
+		}
+	}
+}

src/NHibernate/Type/TypeFactory.cs

@@ -6,6 +6,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using NHibernate.Bytecode;
+using NHibernate.Cfg;
 using NHibernate.Classic;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
@@ -279,6 +280,25 @@ private static void RegisterBuiltInTypes()
 								 len => new SerializableType(typeof (object), SqlTypeFactory.GetBinary(len))));
 		}
 
+		/// <summary>
+		/// <para>Defines which NHibernate type should be chosen by default for handling a given .Net type.</para>
+		/// <para>This must be done before any operation on NHibernate, including building its
+		/// <see cref="Configuration" /> and building session factory. Otherwise the behavior will be undefined.</para>
+		/// </summary>
+		/// <param name="targetType">The NHibernate type.</param>
+		/// <typeparam name="T">The .Net type.</typeparam>
+		public static void SetDefaultType<T>(IType targetType)
+		{
+			if (targetType == null)
+				throw new ArgumentNullException(nameof(targetType));
+
+			var type = typeof(T);
+			foreach (var alias in GetClrTypeAliases(type))
+			{
+				typeByTypeOfName[alias] = targetType;
+			}
+		}
+
 		private static ICollectionTypeFactory CollectionTypeFactory =>
 			Environment.BytecodeProvider.CollectionTypeFactory;