Skip table group join processing for implicit join (#3106)

Author: bahusoid

src/NHibernate.Test/Async/SubclassFilterTest/JoinedSubclassFilterTest.cs

@@ -12,6 +12,7 @@
 using System.Collections;
 using NUnit.Framework;
 using System.Linq;
+using NHibernate.Linq;
 
 namespace NHibernate.Test.SubclassFilterTest
 {
@@ -107,6 +108,35 @@ public async Task FiltersWithSubclassAsync()
 			s.Close();
 		}
 
+		[Test]
+		public async Task FilterCollectionWithSubclass1Async()
+		{
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			await (PrepareTestDataAsync(s));
+
+			s.EnableFilter("minionsWithManager");
+
+			var employees = await (s.Query<Employee>().Where(x => x.Minions.Any()).ToListAsync());
+			Assert.That(employees.Count, Is.EqualTo(1));
+			Assert.That(employees[0].Minions.Count, Is.EqualTo(2));
+		}
+
+		[KnownBug("GH-3079: Collection filter on subclass columns")]
+		[Test]
+		public async Task FilterCollectionWithSubclass2Async()
+		{
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			await (PrepareTestDataAsync(s));
+
+			s.EnableFilter("minionsRegion").SetParameter("userRegion", "US");
+
+			var employees = await (s.Query<Employee>().Where(x => x.Minions.Any()).ToListAsync());
+			Assert.That(employees.Count, Is.EqualTo(1));
+			Assert.That(employees[0].Minions.Count, Is.EqualTo(1));
+		}
+
 		private static async Task PrepareTestDataAsync(ISession s, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			Employee john = new Employee("John Doe");
@@ -147,4 +177,4 @@ public async Task FiltersWithSubclassAsync()
 			await (s.FlushAsync(cancellationToken));
 		}
 	}
-}
+}

src/NHibernate.Test/SubclassFilterTest/JoinedSubclassFilterTest.cs

@@ -95,6 +95,35 @@ public void FiltersWithSubclass()
 			s.Close();
 		}
 
+		[Test]
+		public void FilterCollectionWithSubclass1()
+		{
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			PrepareTestData(s);
+
+			s.EnableFilter("minionsWithManager");
+
+			var employees = s.Query<Employee>().Where(x => x.Minions.Any()).ToList();
+			Assert.That(employees.Count, Is.EqualTo(1));
+			Assert.That(employees[0].Minions.Count, Is.EqualTo(2));
+		}
+
+		[KnownBug("GH-3079: Collection filter on subclass columns")]
+		[Test]
+		public void FilterCollectionWithSubclass2()
+		{
+			using var s = OpenSession();
+			using var t = s.BeginTransaction();
+			PrepareTestData(s);
+
+			s.EnableFilter("minionsRegion").SetParameter("userRegion", "US");
+
+			var employees = s.Query<Employee>().Where(x => x.Minions.Any()).ToList();
+			Assert.That(employees.Count, Is.EqualTo(1));
+			Assert.That(employees[0].Minions.Count, Is.EqualTo(1));
+		}
+
 		private static void PrepareTestData(ISession s)
 		{
 			Employee john = new Employee("John Doe");
@@ -135,4 +164,4 @@ private static void PrepareTestData(ISession s)
 			s.Flush();
 		}
 	}
-}
+}

src/NHibernate.Test/SubclassFilterTest/joined-subclass.hbm.xml

@@ -21,6 +21,8 @@
 			<set name="Minions" inverse="true" lazy="true" cascade="all">
 				<key column="mgr_id"/>
 				<one-to-many class="Employee"/>
+				<filter name="minionsWithManager" condition="mgr_id is not null"/>
+				<filter name="minionsRegion" condition="Region = :userRegion"/>
 			</set>
 		</joined-subclass>
 
@@ -36,4 +38,8 @@
 	<filter-def name="region">
 		<filter-param name="userRegion" type="string"/>
 	</filter-def>
-</hibernate-mapping>
+	<filter-def name="minionsRegion">
+		<filter-param name="userRegion" type="string"/>
+	</filter-def>
+	<filter-def name="minionsWithManager"/>
+</hibernate-mapping>

src/NHibernate/Engine/JoinSequence.cs

@@ -191,7 +191,7 @@ internal JoinFragment ToJoinFragment(
 				last = join.Joinable;
 			}
 
-			if (rootJoinable == null && TableGroupJoinHelper.ProcessAsTableGroupJoin(joins, withClauses, includeAllSubclassJoins, joinFragment, alias => IsIncluded(alias), factory))
+			if (rootJoinable == null && !IsThetaStyle && TableGroupJoinHelper.ProcessAsTableGroupJoin(joins, withClauses, includeAllSubclassJoins, joinFragment, alias => IsIncluded(alias), factory))
 			{
 				return joinFragment;
 			}