Ported back fix for NH-3057

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3057/Domain.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3057
+{
+	public abstract class BaseClass
+	{
+		public virtual int Id { get; set; }
+		public virtual string InheritedProperty { get; set; }
+	}
+
+	public class AClass 
+	{
+		private ICollection<BClass> bs = new List<BClass>(); 
+		
+		public virtual int Id { get; set; }
+
+		public virtual ICollection<BClass> Bs
+		{
+			get { return bs; }
+			protected internal set { bs = value; }
+		}
+	}
+
+	public class BClass : BaseClass
+	{
+		public virtual AClass A { get; set; }
+	}
+}

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

@@ -0,0 +1,64 @@
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3057
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var a = new AClass { Id = 1 };
+				session.Save(a);
+
+				var b = new BClass { Id = 2, A = a, InheritedProperty = "B2" };
+				session.Save(b);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void CollectionQueryOnJoinedSubclassInheritedProperty()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var entities = session.Query<AClass>()
+					.Where(a => a.Bs.Any(b => b.InheritedProperty == "B2"))
+					.ToList();
+
+				Assert.AreEqual(1, entities.Count);
+				Assert.AreEqual(1, entities[0].Id);
+			}
+		}
+
+		[Test]
+		public void CollectionQueryOnJoinedSubclassInheritedPropertyHql()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var entities = session.CreateQuery("from AClass a where exists (from a.Bs b where b.InheritedProperty = 'B2')")
+					.List<AClass>();
+
+				Assert.AreEqual(1, entities.Count);
+				Assert.AreEqual(1, entities[0].Id);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" 
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH3057">
+  
+  <class name="BaseClass" table="baseclass">
+    <id name="Id" column="id">
+      <generator class="assigned" />
+    </id>
+    <property name="InheritedProperty" column="inheritedproperty" />
+
+    <joined-subclass name="BClass" table="bclass">
+      <key column="id" />
+      <many-to-one name="A" column="aid" class="AClass" />
+    </joined-subclass>
+  </class>
+
+  <class name="AClass" table="aclass">
+    <id name="Id" column="id" generator="assigned" />
+    <set name="Bs" inverse="true" lazy="true">
+      <key column="aid" />
+      <one-to-many class="BClass" />
+    </set>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -687,6 +687,8 @@
     <Compile Include="NHSpecificTest\NH3332\State.cs" />
     <Compile Include="NHSpecificTest\NH3332\StateDescription.cs" />
     <Compile Include="NHSpecificTest\NH3332\TestJoinsWithSameTable.cs" />
+    <Compile Include="NHSpecificTest\NH3057\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH3057\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2651\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2651\Model.cs" />
     <Compile Include="NHSpecificTest\NH2789\Entities.cs" />
@@ -2877,6 +2879,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH2860\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3332\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3050\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3057\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2651\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3121\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2789\Mappings.hbm.xml" />

src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs

@@ -348,9 +348,10 @@ private FromElement CreateEntityAssociation(
 					Log.Debug("createEntityAssociation() : One to many - path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
 				}
 
-				JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType);
+				var joinSequence = CreateJoinSequence(roleAlias, joinType);
 
-				elem = CreateJoin(associatedEntityName, roleAlias, joinSequence, (EntityType)_queryableCollection.ElementType, false);
+				elem = CreateJoin(associatedEntityName, roleAlias, joinSequence, (EntityType) _queryableCollection.ElementType, false);
+				elem.UseFromFragment |= elem.IsImplied && elem.Walker.IsSubQuery;
 			}
 			else
 			{
@@ -359,8 +360,7 @@ private FromElement CreateEntityAssociation(
 					Log.Debug("createManyToMany() : path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
 				}
 
-				elem = CreateManyToMany(role, associatedEntityName,
-								roleAlias, entityPersister, (EntityType)_queryableCollection.ElementType, joinType);
+				elem = CreateManyToMany(role, associatedEntityName, roleAlias, entityPersister, (EntityType)_queryableCollection.ElementType, joinType);
 				_fromClause.Walker.AddQuerySpaces(_queryableCollection.CollectionSpaces);
 			}
 			elem.CollectionTableAlias = roleAlias;