Remove IQueryable<T> from PostExecuteTransformer

Author: hazzik

src/NHibernate/Impl/FutureValue.cs

@@ -22,9 +22,9 @@ public T Value
 				var result = getResult();
 				if (ExecuteOnEval != null)
 					// When not null, ExecuteOnEval is fetched with PostExecuteTransformer from IntermediateHqlTree
-					// through ExpressionToHqlTranslationResults, which requires a IQueryable as input and directly
+					// through ExpressionToHqlTranslationResults, which requires a IEnumerable as input and directly
 					// yields the scalar result when the query is scalar.
-					return (T)ExecuteOnEval.DynamicInvoke(result.AsQueryable());
+					return (T)ExecuteOnEval.DynamicInvoke(result);
 
 				return result.FirstOrDefault();
 			}
@@ -35,4 +35,4 @@ public Delegate ExecuteOnEval
 			get; set;
 		}
 	}
-}
+}

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -109,7 +109,7 @@ protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery
 			{
 				try
 				{
-					return nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer.DynamicInvoke(results.AsQueryable());
+					return nhQuery.ExpressionToHqlTranslationResults.PostExecuteTransformer.DynamicInvoke(results);
 				}
 				catch (TargetInvocationException e)
 				{
@@ -171,4 +171,4 @@ public virtual void SetResultTransformerAndAdditionalCriteria(IQuery query, NhLi
 			}
 		}
 	}
-}
+}

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

@@ -8,9 +8,9 @@ namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 	public class ProcessFirst : ProcessFirstOrSingleBase, IResultOperatorProcessor<FirstResultOperator>
 	{
 		private static readonly MethodInfo FirstOrDefault =
-			ReflectHelper.GetMethodDefinition(() => Queryable.FirstOrDefault<object>(null));
+			ReflectHelper.GetMethodDefinition(() => Enumerable.FirstOrDefault<object>(null));
 		private static readonly MethodInfo First =
-			ReflectHelper.GetMethodDefinition(() => Queryable.First<object>(null));
+			ReflectHelper.GetMethodDefinition(() => Enumerable.First<object>(null));
 
 		public void Process(FirstResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
 		{
@@ -21,4 +21,4 @@ public void Process(FirstResultOperator resultOperator, QueryModelVisitor queryM
 			tree.AddTakeClause(tree.TreeBuilder.Constant(1));
 		}
 	}
-}
+}

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

@@ -12,7 +12,7 @@ protected static void AddClientSideEval(MethodInfo target, QueryModelVisitor que
 			var type = queryModelVisitor.Model.ResultTypeOverride ?? queryModelVisitor.Model.SelectClause.Selector.Type;
 			target = target.MakeGenericMethod(type);
 
-			var parameter = Expression.Parameter(typeof(IQueryable<>).MakeGenericType(type), null);
+			var parameter = Expression.Parameter(typeof(IEnumerable<>).MakeGenericType(type), null);
 
 			var lambda = Expression.Lambda(
 				Expression.Call(
@@ -23,4 +23,4 @@ protected static void AddClientSideEval(MethodInfo target, QueryModelVisitor que
 			tree.AddPostExecuteTransformer(lambda);
 		}
 	}
-}
+}

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

@@ -8,9 +8,9 @@ namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
 	public class ProcessSingle : ProcessFirstOrSingleBase, IResultOperatorProcessor<SingleResultOperator>
 	{
 		private static readonly MethodInfo SingleOrDefault =
-			ReflectHelper.GetMethodDefinition(() => Queryable.SingleOrDefault<object>(null));
+			ReflectHelper.GetMethodDefinition(() => Enumerable.SingleOrDefault<object>(null));
 		private static readonly MethodInfo Single =
-			ReflectHelper.GetMethodDefinition(() => Queryable.Single<object>(null));
+			ReflectHelper.GetMethodDefinition(() => Enumerable.Single<object>(null));
 
 		public void Process(SingleResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
 		{
@@ -19,4 +19,4 @@ public void Process(SingleResultOperator resultOperator, QueryModelVisitor query
 			AddClientSideEval(firstMethod, queryModelVisitor, tree);
 		}
 	}
-}
+}