Merge pull request nhibernate#597 from fredericDelaporte/NH-3693

NH-3693 - AliasToBeanResultTransformer fails under Firebird

Author: fredericDelaporte

src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs

@@ -128,7 +128,9 @@ private void AssertObjectsAreEqual(object expected, object actual, string name)
 
 			if ((expectedType.IsValueType)
 				|| (expected is System.Type)
-				|| (expected is string))
+				|| (expected is string)
+				|| (expected is FieldInfo)
+				|| (expected is PropertyInfo))
 			{
 				Assert.AreEqual(expected, actual, fieldPath);
 				_fieldPath.Pop();

src/NHibernate.Test/NHSpecificTest/NH1904/Model.cs

@@ -9,4 +9,19 @@ public class Invoice
 
 		protected virtual DateTime issued { get; set; }
 	}
+
+	public class InvoiceWithAddress : Invoice
+	{
+		public virtual Address BillingAddress { get; set; }
+	}
+
+	public struct Address
+	{
+		public string Line { get; set; }
+		public string line { get; set; }
+		public string Line2 { get; set; }
+		public string City { get; set; }
+		public string ZipCode { get; set; }
+		public string Country { get; set; }
+	}
 }

src/NHibernate.Test/NHSpecificTest/NH1904/StructFixture.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1904
+{
+	[TestFixture]
+	public class StructFixture : BugTestCase
+	{
+		protected override IList Mappings =>
+			new string[]
+			{
+				"NHSpecificTest." + BugNumber + ".StructMappings.hbm.xml"
+			};
+
+		[Test]
+		public void ExecuteQuery()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var invoice = new InvoiceWithAddress
+				{
+					Issued = DateTime.Now,
+					BillingAddress = new Address { Line = "84 rue du 22 septembre", City = "Courbevoie", ZipCode = "92400", Country = "France" }
+				};
+				session.Save(invoice);
+				transaction.Commit();
+			}
+
+			using (ISession session = OpenSession())
+			{
+				var invoices = session.CreateCriteria<Invoice>().List<Invoice>();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (ISession session = OpenSession())
+			{
+				session.CreateQuery("delete from InvoiceWithAddress").ExecuteUpdate();
+				session.Flush();
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH1904/StructMappings.hbm.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+    assembly="NHibernate.Test"
+    namespace="NHibernate.Test.NHSpecificTest.NH1904">
+
+  <class name="InvoiceWithAddress">
+    <id name="ID" type="Int32">
+      <generator class="hilo" />
+    </id>
+
+    <property name="Issued" type="DateTime" />
+
+    <component name="BillingAddress">
+      <property name="Line"/>
+      <property name="Line2"/>
+      <property name="City"/>
+      <property name="ZipCode"/>
+      <property name="Country"/>
+    </component>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -742,6 +742,7 @@
     <Compile Include="NHSpecificTest\EntityWithUserTypeCanHaveLinqGenerators\FooExample.cs" />
     <Compile Include="NHSpecificTest\EntityWithUserTypeCanHaveLinqGenerators\IExample.cs" />
     <Compile Include="Insertordering\NH3931Entities.cs" />
+    <Compile Include="NHSpecificTest\NH1904\StructFixture.cs" />
     <Compile Include="NHSpecificTest\NH3247\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3247\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3386\Entity.cs" />
@@ -3251,6 +3252,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH1904\StructMappings.hbm.xml" />
     <EmbeddedResource Include="Insertordering\FamilyModel\Mappings.hbm.xml" />
     <EmbeddedResource Include="Insertordering\AnimalModel\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3247\Mappings.hbm.xml" />