Fix Criteria withClause for many-to-many

Author: bahusoid

src/NHibernate.Test/Async/NHSpecificTest/GH1994/Fixture.cs

@@ -9,8 +9,10 @@
 
 
 using System.Linq;
+using NHibernate.Criterion;
 using NHibernate.Dialect;
 using NHibernate.Linq;
+using NHibernate.SqlCommand;
 using NHibernate.Transform;
 using NUnit.Framework;
 
@@ -82,6 +84,7 @@ public async Task TestFilteredByWhereCollectionLinqQueryAsync()
 			}
 		}
 
+		//GH-1994
 		[Test]
 		public async Task TestFilteredLinqQueryAsync()
 		{
@@ -113,5 +116,22 @@ public async Task TestFilteredQueryOverAsync()
 				Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
 			}
 		}
+
+		//NH-2991
+		[Test]
+		public async Task TestQueryOverRestrictionWithClauseAsync()
+		{
+			using (var s = OpenSession())
+			{
+				Document docs = null;
+				var query = await (s.QueryOver<Asset>()
+							 .JoinQueryOver(a => a.Documents, () => docs, JoinType.LeftOuterJoin, Restrictions.Where(() => docs.IsDeleted != true))
+							 .TransformUsing(Transformers.DistinctRootEntity)
+							 .ListAsync<Asset>());
+
+				Assert.That(query.Count, Is.EqualTo(1), "filtered assets");
+				Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
+			}
+		}
 	}
 }

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

@@ -1,6 +1,8 @@
 using System.Linq;
+using NHibernate.Criterion;
 using NHibernate.Dialect;
 using NHibernate.Linq;
+using NHibernate.SqlCommand;
 using NHibernate.Transform;
 using NUnit.Framework;
 
@@ -71,6 +73,7 @@ public void TestFilteredByWhereCollectionLinqQuery()
 			}
 		}
 
+		//GH-1994
 		[Test]
 		public void TestFilteredLinqQuery()
 		{
@@ -102,5 +105,22 @@ public void TestFilteredQueryOver()
 				Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
 			}
 		}
+
+		//NH-2991
+		[Test]
+		public void TestQueryOverRestrictionWithClause()
+		{
+			using (var s = OpenSession())
+			{
+				Document docs = null;
+				var query = s.QueryOver<Asset>()
+							 .JoinQueryOver(a => a.Documents, () => docs, JoinType.LeftOuterJoin, Restrictions.Where(() => docs.IsDeleted != true))
+							 .TransformUsing(Transformers.DistinctRootEntity)
+							 .List<Asset>();
+
+				Assert.That(query.Count, Is.EqualTo(1), "filtered assets");
+				Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
+			}
+		}
 	}
 }

src/NHibernate/Loader/JoinWalker.cs

@@ -168,6 +168,7 @@ private void AddAssociationToJoinTree(IAssociationType type, string[] aliasedLhs
 			IJoinable joinable = type.GetAssociatedJoinable(Factory);
 
 			string subalias = GenerateTableAlias(associations.Count + 1, path, subPathAlias, joinable);
+			var qc = joinable.IsCollection ? (IQueryableCollection) joinable : null;
 
 			var assoc =
 				new OuterJoinableAssociation(
@@ -176,7 +177,8 @@ private void AddAssociationToJoinTree(IAssociationType type, string[] aliasedLhs
 					aliasedLhsColumns,
 					subalias,
 					joinType,
-					GetWithClause(path, subPathAlias),
+					//for many-to-many with clause is applied with OuterJoinableAssociation created for entity persister so simply skip it here
+					qc?.IsManyToMany == true ? null : GetWithClause(path, subPathAlias),
 					Factory,
 					enabledFilters,
 					GetSelectMode(path));
@@ -185,17 +187,15 @@ private void AddAssociationToJoinTree(IAssociationType type, string[] aliasedLhs
 
 			int nextDepth = currentDepth + 1;
 
-			if (!joinable.IsCollection)
+			if (qc == null)
 			{
 				IOuterJoinLoadable pjl = joinable as IOuterJoinLoadable;
 				if (pjl != null)
 					WalkEntityTree(pjl, subalias, path, nextDepth);
 			}
 			else
 			{
-				IQueryableCollection qc = joinable as IQueryableCollection;
-				if (qc != null)
-					WalkCollectionTree(qc, subalias, path, subPathAlias, nextDepth);
+				WalkCollectionTree(qc, subalias, path, subPathAlias, nextDepth);
 			}
 		}