Merge pull request #66 from hazzik/NH-3032

NH-3032: Linq - Group By with contains inside where clause throws exceptions (regression)
nhibernate · Jan 24, 2012 · 6038541 · 6038541
2 parents e20f9be + b0ca240
commit 6038541
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 8 deletions.
diff --git a/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs b/src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs
@@ -201,6 +201,36 @@ public void SingleKeyGroupAndOrderByKeyProjection()
 			AssertOrderedBy.Ascending(result, x => x.UnitPrice);
 		}
 
+		[Test]
+		public void GroupByWithAndAlsoContainsInWhereClause()
+		{
+			//NH-3032
+			var collection = db.Products.Select(x => x.Supplier).ToList();
+
+			var result = db.Products
+				.Where(x => x.Discontinued == true && collection.Contains(x.Supplier))
+				.GroupBy(x => x.UnitPrice)
+				.Select(x => new {x.Key, Count = x.Count()})
+				.ToList();
+
+			Assert.That(result.Count, Is.EqualTo(8));
+		}
+
+		[Test]
+		public void GroupByWithContainsInWhereClause()
+		{
+			//NH-3032
+			var collection = db.Products.Select(x => x.Supplier).ToList();
+
+			var result = db.Products
+				.Where(x => collection.Contains(x.Supplier))
+				.GroupBy(x => x.UnitPrice)
+				.Select(x => new {x.Key, Count = x.Count()})
+				.ToList();
+
+			Assert.That(result.Count, Is.EqualTo(62));
+		}
+
 		private static void CheckGrouping<TKey, TElement>(IEnumerable<IGrouping<TKey, TElement>> groupedItems, Func<TElement, TKey> groupBy)
 		{
 			var used = new HashSet<object>();

diff --git a/src/NHibernate/Linq/GroupBy/AggregatingGroupByRewriter.cs b/src/NHibernate/Linq/GroupBy/AggregatingGroupByRewriter.cs
@@ -54,13 +54,18 @@ private static void FlattenSubQuery(SubQueryExpression subQueryExpression, Query
 
 			queryModel.ResultOperators.Add(groupBy);
 
-			foreach (var whereClause in queryModel.BodyClauses.OfType<WhereClause>().ToArray())
+			for (int i = 0; i < queryModel.BodyClauses.Count; i++)
 			{
-				//all outer where clauses actually are having clauses
-				var clause = new NhHavingClause(whereClause.Predicate);
+				var clause = queryModel.BodyClauses[i];
+				clause.TransformExpressions(s => GroupBySelectClauseRewriter.ReWrite(s, groupBy, subQueryExpression.QueryModel));
 
-				queryModel.BodyClauses.Add(clause);
-				queryModel.BodyClauses.Remove(whereClause);
+				//all outer where clauses actually are having clauses
+				var whereClause = clause as WhereClause;
+				if (whereClause != null)
+				{
+					queryModel.BodyClauses.RemoveAt(i);
+					queryModel.BodyClauses.Insert(i, new NhHavingClause(whereClause.Predicate));
+				}
 			}
 
 			foreach (var bodyClause in subQueryExpression.QueryModel.BodyClauses)
@@ -72,9 +77,6 @@ private static void FlattenSubQuery(SubQueryExpression subQueryExpression, Query
 			queryModel.SelectClause.TransformExpressions(s => 
 				GroupBySelectClauseRewriter.ReWrite(s, groupBy, subQueryExpression.QueryModel));
 
-			foreach (var clause in queryModel.BodyClauses)
-				clause.TransformExpressions(s => GroupBySelectClauseRewriter.ReWrite(s, groupBy, subQueryExpression.QueryModel));
-
 			// Point all query source references to the outer from clause
 			queryModel.TransformExpressions(s =>
 				new SwapQuerySourceVisitor(queryModel.MainFromClause, subQueryExpression.QueryModel.MainFromClause).Swap(s));