Fix NH-2042

Author: hazzik

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

@@ -0,0 +1,48 @@
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2042
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Save(new Owner { Name = "Bob" });
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void TestPropertyOfOwnerShouldBeOne()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = (from e in session.Query<Person>()
+							  where e.Name == "Bob"
+							  select e).Single();
+
+				Assert.That(((Owner) result).Test, Is.EqualTo(1));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2042">
+  <class name="Person">
+    <id name="Id" generator="guid.comb" />
+    <discriminator column="discriminator" type="string" />
+    <property name="Name" />
+    <subclass name="Owner">
+      <join table="Owner" fetch="select">
+        <key column="OwnerId" />
+        <property name="SomeProperty" />
+        <property name="Test">
+          <formula>1</formula>
+        </property>
+      </join>
+    </subclass>
+  </class>
+</hibernate-mapping>

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

@@ -0,0 +1,16 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH2042
+{
+	public class Person
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
+	public class Owner : Person
+	{
+		public virtual string SomeProperty { get; set; }
+		public virtual long Test { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -667,6 +667,8 @@
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
     <Compile Include="NHSpecificTest\NH3374\Document.cs" />
     <Compile Include="NHSpecificTest\NH3374\FixtureByCode.cs" />
+    <Compile Include="NHSpecificTest\NH2042\Model.cs" />
+    <Compile Include="NHSpecificTest\NH2042\Fixture.cs" />
     <Compile Include="NHSpecificTest\Dates\DateTimeOffsetQueryFixture.cs" />
     <Compile Include="NHSpecificTest\NH3050\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3050\Person.cs" />
@@ -2862,6 +2864,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH2042\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2860\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3332\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3050\Mappings.hbm.xml" />

src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs

@@ -658,7 +658,7 @@ private SqlString GenerateSequentialSelect(ILoadable persister)
 
 			//figure out which formulas are needed (excludes lazy-properties)
 			List<int> formulaNumbers = new List<int>();
-			int[] formulaTableNumbers = SubclassColumnTableNumberClosure;
+			int[] formulaTableNumbers = SubclassFormulaTableNumberClosure;
 			for (int i = 0; i < SubclassFormulaTemplateClosure.Length; i++)
 			{
 				if (tableNumbers.Contains(formulaTableNumbers[i]))