Fix for #2479

ngbrown · ngbrown · commit 7b95d7cac511 · 2020-08-15T15:32:16.000-07:00
diff --git a/src/NHibernate/Linq/GroupBy/PagingRewriter.cs b/src/NHibernate/Linq/GroupBy/PagingRewriter.cs
@@ -53,7 +53,8 @@ private static void FlattenSubQuery(SubQueryExpression subQueryExpression, Query
 				var where = new WhereClause(new SubQueryExpression(newSubQueryModel));
 				queryModel.BodyClauses.Add(where);
 
-				if (!queryModel.BodyClauses.OfType<OrderByClause>().Any())
+				if (!queryModel.BodyClauses.OfType<OrderByClause>().Any() && 
+					!(queryModel.ResultOperators.Count == 1 && queryModel.ResultOperators.All(x => x is AnyResultOperator || x is ContainsResultOperator || x is AllResultOperator)))
 				{
 					var orderByClauses = subQueryModel.BodyClauses.OfType<OrderByClause>();
 					foreach (var orderByClause in orderByClauses)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ private static void FlattenSubQuery(SubQueryExpression subQueryExpression, Query`
`53`	`53`	`var where = new WhereClause(new SubQueryExpression(newSubQueryModel));`
`54`	`54`	`queryModel.BodyClauses.Add(where);`
`55`	`55`
`56`		`- if (!queryModel.BodyClauses.OfType<OrderByClause>().Any())`
	`56`	`+ if (!queryModel.BodyClauses.OfType<OrderByClause>().Any() &&`
	`57`	`+ !(queryModel.ResultOperators.Count == 1 && queryModel.ResultOperators.All(x => x is AnyResultOperator \|\| x is ContainsResultOperator \|\| x is AllResultOperator)))`
`57`	`58`	`{`
`58`	`59`	`var orderByClauses = subQueryModel.BodyClauses.OfType<OrderByClause>();`
`59`	`60`	`foreach (var orderByClause in orderByClauses)`