Merge branch 'acutus-NH-2354'

Author: hazzik

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1230,6 +1230,10 @@
     <Compile Include="Unionsubclass\DatabaseKeywordBase.cs" />
     <Compile Include="Unionsubclass\DatabaseKeywordsFixture.cs" />
     <Compile Include="UtilityTest\ArrayHelperTests.cs" />
+    <Compile Include="UnionsubclassPolymorphicFormula\Company.cs" />
+    <Compile Include="UnionsubclassPolymorphicFormula\Party.cs" />
+    <Compile Include="UnionsubclassPolymorphicFormula\Person.cs" />
+    <Compile Include="UnionsubclassPolymorphicFormula\UnionSubclassFixture.cs" />
     <Compile Include="UtilityTest\IdentitySetFixture.cs" />
     <Compile Include="UtilityTest\EnumerableExtensionsTests\AnyExtensionTests.cs" />
     <Compile Include="UtilityTest\EnumerableExtensionsTests\FirstExtensionTests.cs" />
@@ -3048,6 +3052,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3332\Mappings.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="UnionsubclassPolymorphicFormula\Party.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3050\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2469\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2033\Mappings.hbm.xml" />

src/NHibernate.Test/UnionsubclassPolymorphicFormula/Company.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.UnionsubclassPolymorphicFormula
+{
+	public class Company : Party
+	{
+		public override string Name { get { return this.CompanyName; } }
+		public virtual string CompanyName { get; set; }
+	}
+}

src/NHibernate.Test/UnionsubclassPolymorphicFormula/Party.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.UnionsubclassPolymorphicFormula
+{
+	public abstract class Party
+	{
+		public virtual long Id { get; protected internal set; }
+		public abstract string Name { get; }
+	}
+}

src/NHibernate.Test/UnionsubclassPolymorphicFormula/Party.hbm.xml

@@ -0,0 +1,41 @@
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+	assembly="NHibernate.Test"
+	namespace="NHibernate.Test.UnionsubclassPolymorphicFormula">
+
+  <!--
+  Testing the inheritance of the abstract property "Name"
+  -->
+
+  <!-- PARTY -->
+
+  <class xmlns="urn:nhibernate-mapping-2.2" name="Party" table="`party`" abstract="true">
+    <id access="backfield" name="Id">
+      <column name="Id" />
+      <generator class="hilo" />
+    </id>
+
+    <!-- PERSON -->
+
+    <union-subclass name="Person" table="`person`" extends="Party">
+      <property name="Name" access="readonly" formula="first_name || ' ' || last_name" update="false" insert="false" />
+      <property name="FirstName">
+        <column name="first_name" />
+      </property>
+      <property name="LastName">
+        <column name="last_name" />
+      </property>
+    </union-subclass>
+
+    <!-- COMPANY-->
+
+    <union-subclass name="Company" table="`company`" extends="Party">
+      <property name="Name" access="readonly" update="false" insert="false">
+        <column name="company_name" />
+      </property>
+      <property name="CompanyName">
+        <column name="company_name" />
+      </property>
+    </union-subclass>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/UnionsubclassPolymorphicFormula/Person.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.UnionsubclassPolymorphicFormula
+{
+	public class Person : Party
+	{
+		public override string Name { get { return this.FirstName + " " + this.LastName; } }
+		public virtual string FirstName { get; set; }
+		public virtual string LastName { get; set; }
+	}
+}

src/NHibernate.Test/UnionsubclassPolymorphicFormula/UnionSubclassFixture.cs

@@ -0,0 +1,65 @@
+using NUnit.Framework;
+using System.Collections;
+
+namespace NHibernate.Test.UnionsubclassPolymorphicFormula
+{
+	[TestFixture, Explicit]
+	public class UnionSubclassFixture : TestCase
+	{
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override IList Mappings
+		{
+			get { return new string[] { "UnionsubclassPolymorphicFormula.Party.hbm.xml" }; }
+		}
+
+		[Test, KnownBug("NH-2354")]
+		public void QueryOverPersonTest()
+		{
+			using (ISession s = OpenSession())
+			{
+				using (ITransaction t = s.BeginTransaction())
+				{
+					var person = new Person
+					{
+						FirstName = "Mark",
+						LastName = "Mannson"
+					};
+
+					s.Save(person);
+
+					var result = s.QueryOver<Party>().Where(p => p.Name == "Mark Mannson").SingleOrDefault();
+					
+					Assert.NotNull(result);
+					s.Delete(result);
+					t.Commit();
+				}
+				
+			}
+		}
+
+		[Test, KnownBug("NH-2354")]
+		public void QueryOverCompanyTest()
+		{
+			using (ISession s = OpenSession())
+			{
+				using (ITransaction t = s.BeginTransaction())
+				{
+					var company = new Company
+					{
+						CompanyName = "Limited",
+					};
+
+					s.Save(company);
+
+					var result = s.QueryOver<Party>().Where(p => p.Name == "Limited").SingleOrDefault();
+					Assert.NotNull(result);
+				}
+
+			}
+		}
+	}
+}