fixed reading milliseconds from datetime2 column via CreateSQLQuery()

Author: Ralf1108

src/NHibernate.Test/NHSpecificTest/EntityWithDatetime2/Fixture.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.EntityWithDatetime2
+{
+    [TestFixture]
+    public class Fixture : BugTestCase
+    {
+        protected override void OnTearDown()
+        {
+            using (var s = OpenSession())
+            using (var tx = s.BeginTransaction())
+            {
+                s.CreateSQLQuery("delete from LogEntry").ExecuteUpdate();
+                tx.Commit();
+            }
+        }
+
+        [Test]
+        public void ShouldBePossibleToReadMillisecondsFromDatetime2ViaCreateSQLQuery()
+        {
+            var now = DateTime.UtcNow;
+
+            using (var session = OpenSession())
+            using (var transaction = session.BeginTransaction())
+            {
+                var entry = new LogEntry {Text = "Test", CreatedAt = now};
+                session.Save(entry);
+
+                session.Flush();
+                transaction.Commit();
+            }
+
+            using (var session = OpenSession())
+            {
+                var datetimeViaQuery = session
+                    .Query<LogEntry>()
+                    .Select(x => x.CreatedAt)
+                    .Single();
+
+                Assert.That(datetimeViaQuery.Millisecond, Is.EqualTo(now.Millisecond));
+
+                var datetimeViaCreateSqlQuery = session.CreateSQLQuery("SELECT CreatedAt FROM LogEntry")
+                                                       .List()
+                                                       .Cast<DateTime>()
+                                                       .Single();
+
+                Assert.That(datetimeViaCreateSqlQuery.Millisecond, Is.EqualTo(now.Millisecond));
+            }
+        }
+    }
+}

src/NHibernate.Test/NHSpecificTest/EntityWithDatetime2/LogEntry.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.EntityWithDatetime2
+{
+    public class LogEntry
+    {
+        public virtual int Id { get; set; }
+        public virtual string Text { get; set; }
+        public virtual DateTime CreatedAt { get; set; }
+    }
+}

src/NHibernate.Test/NHSpecificTest/EntityWithDatetime2/Mappings.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.EntityWithDatetime2">
+
+  <class name="LogEntry">
+    <id name="Id" type="Int32" generator="native" />
+    <property name="Text" type="string"/>
+    <property name="CreatedAt" type="datetime2"/>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1363,6 +1363,8 @@
     <Compile Include="NHSpecificTest\NH3800\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3757\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3757\Money.cs" />
+    <Compile Include="NHSpecificTest\EntityWithDatetime2\Fixture.cs" />
+    <Compile Include="NHSpecificTest\EntityWithDatetime2\LogEntry.cs" />
     <Compile Include="NHSpecificTest\Properties\CompositePropertyRefTest.cs" />
     <Compile Include="NHSpecificTest\Properties\DynamicEntityTest.cs" />
     <Compile Include="NHSpecificTest\Properties\Model.cs" />
@@ -3247,6 +3249,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\EntityWithDatetime2\Mappings.hbm.xml" />
     <EmbeddedResource Include="Insertordering\FamilyModel\Mappings.hbm.xml" />
     <EmbeddedResource Include="Insertordering\AnimalModel\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3247\Mappings.hbm.xml" />

src/NHibernate/Loader/Custom/CustomLoader.cs

@@ -549,8 +549,12 @@ public string GetColumnName(int position)
 			/// <returns>The Hibernate type.</returns>
 			public IType GetHibernateType(int columnPos)
 			{
-				return TypeFactory.Basic(resultSet.GetFieldType(columnPos).Name);
-			}
+                var type = TypeFactory.Basic(resultSet.GetDataTypeName(columnPos));
+                if (type == null)
+                    return TypeFactory.Basic(resultSet.GetFieldType(columnPos).Name);
+
+                return type;
+            }
 		}
 	}
 }