NH-3951: supporting .All as final result. And refactoring .Any as final result for avoiding HQL tree inspection.

Author: fredericDelaporte

src/NHibernate/Linq/IntermediateHqlTree.cs

@@ -30,6 +30,14 @@ public class IntermediateHqlTree
 		private HqlTreeNode _root;
 		private HqlOrderBy _orderBy;
 
+		public bool IsRoot
+		{
+			get
+			{
+				return _isRoot;
+			}
+		}
+
 		public HqlTreeNode Root
 		{
 			get
@@ -53,11 +61,6 @@ public IntermediateHqlTree(bool root)
 
 		public ExpressionToHqlTranslationResults GetTranslation()
 		{
-			if (_isRoot)
-			{
-				DetectOuterExists();
-			}
-
 			return new ExpressionToHqlTranslationResults(Root,
 														 _itemTransformers,
 														 _listTransformers,
@@ -201,19 +204,6 @@ public void AddHavingClause(HqlBooleanExpression where)
 			}
 		}
 
-		private void DetectOuterExists()
-		{
-			if (_root is HqlExists)
-			{
-				_takeCount = TreeBuilder.Constant(1);
-				_root = Root.Children.First();
-
-				Expression<Func<IEnumerable<object>, bool>> x = l => l.Any();
-
-				_listTransformers.Add(x);
-			}
-		}
-
 		public void AddAdditionalCriteria(Action<IQuery, IDictionary<string, Tuple<object, IType>>> criteria)
 		{
 			_additionalCriteria.Add(criteria);

src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessAll.cs

@@ -1,17 +1,31 @@
-using NHibernate.Hql.Ast;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using NHibernate.Hql.Ast;
 using Remotion.Linq.Clauses.ResultOperators;
 
 namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 {
-    public class ProcessAll : IResultOperatorProcessor<AllResultOperator>
-    {
-        public void Process(AllResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
-        {
-            tree.AddWhereClause(tree.TreeBuilder.BooleanNot(
-                               HqlGeneratorExpressionTreeVisitor.Visit(resultOperator.Predicate, queryModelVisitor.VisitorParameters).
-                                   ToBooleanExpression()));
+	public class ProcessAll : IResultOperatorProcessor<AllResultOperator>
+	{
+		public void Process(AllResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
+		{
+			tree.AddWhereClause(tree.TreeBuilder.BooleanNot(
+				HqlGeneratorExpressionTreeVisitor.Visit(resultOperator.Predicate, queryModelVisitor.VisitorParameters).
+					ToBooleanExpression()));
 
-            tree.SetRoot(tree.TreeBuilder.BooleanNot(tree.TreeBuilder.Exists((HqlQuery) tree.Root)));
-        }
-    }
+			if (tree.IsRoot)
+			{
+				tree.AddTakeClause(tree.TreeBuilder.Constant(1));
+
+				Expression<Func<IEnumerable<object>, bool>> x = l => !l.Any();
+				tree.AddListTransformer(x);
+			}
+			else
+			{
+				tree.SetRoot(tree.TreeBuilder.BooleanNot(tree.TreeBuilder.Exists((HqlQuery)tree.Root)));
+			}
+		}
+	}
 }

src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessAny.cs

@@ -1,13 +1,27 @@
-using NHibernate.Hql.Ast;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using NHibernate.Hql.Ast;
 using Remotion.Linq.Clauses.ResultOperators;
 
 namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 {
-    public class ProcessAny : IResultOperatorProcessor<AnyResultOperator>
-    {
-        public void Process(AnyResultOperator anyOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
-        {
-            tree.SetRoot(tree.TreeBuilder.Exists((HqlQuery) tree.Root));
-        }
-    }
+	public class ProcessAny : IResultOperatorProcessor<AnyResultOperator>
+	{
+		public void Process(AnyResultOperator anyOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
+		{
+			if (tree.IsRoot)
+			{
+				tree.AddTakeClause(tree.TreeBuilder.Constant(1));
+
+				Expression<Func<IEnumerable<object>, bool>> x = l => l.Any();
+				tree.AddListTransformer(x);
+			}
+			else
+			{
+				tree.SetRoot(tree.TreeBuilder.Exists((HqlQuery)tree.Root));
+			}
+		}
+	}
 }