Exposed session in DefaultQueryProvider

Author: bahusoid

src/NHibernate.Test/Linq/ExpressionSessionLeakTest.cs

@@ -38,9 +38,9 @@ private WeakReference DoLinqInSeparateSession()
 			}
 		}
 
-		static readonly PropertyInfo SessionProperty = typeof(DefaultQueryProvider).GetProperty(
-			"Session",
-			BindingFlags.NonPublic | BindingFlags.Instance);
+		private static readonly PropertyInfo SessionProperty = typeof(DefaultQueryProvider).GetProperty(
+			nameof(DefaultQueryProvider.Session),
+			BindingFlags.Public | BindingFlags.Instance);
 
 		[Theory]
 		public void SessionIsNotNullOrResurrected(bool? disposeSession)

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -31,7 +31,7 @@ public partial interface INhQueryProvider : IQueryProvider
 	public interface ISupportFutureBatchNhQueryProvider
 	{
 		IQuery GetPreparedQuery(Expression expression, out NhLinqExpression nhExpression);
-		IQueryBatch GetFutureBatch();
+		ISessionImplementor Session { get; }
 	}
 
 	/// <summary>
@@ -77,7 +77,7 @@ private DefaultQueryProvider(ISessionImplementor session, object collection, NhQ
 
 		public object Collection { get; }
 
-		protected virtual ISessionImplementor Session
+		public virtual ISessionImplementor Session
 		{
 			get
 			{
@@ -295,10 +295,5 @@ public IQuery GetPreparedQuery(Expression expression, out NhLinqExpression nhExp
 			nhExpression = PrepareQuery(expression, out var query);
 			return query;
 		}
-
-		public IQueryBatch GetFutureBatch()
-		{
-			return Session.GetFutureBatch();
-		}
 	}
 }

src/NHibernate/Linq/LinqExtensionMethods.cs

@@ -8,6 +8,7 @@
 using Remotion.Linq.Parsing.ExpressionVisitors;
 using System.Threading;
 using System.Threading.Tasks;
+using NHibernate.Engine;
 
 namespace NHibernate.Linq
 {
@@ -2406,7 +2407,7 @@ public static IFutureEnumerable<TSource> ToFuture<TSource>(this IQueryable<TSour
 		{
 			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureBatch().AddAsEnumerable(source);
+				return batchProvider.Session.GetFutureBatch().AddAsEnumerable(source);
 			}
 #pragma warning disable CS0618 // Type or member is obsolete
 			var provider = GetNhProvider(source);
@@ -2427,7 +2428,7 @@ public static IFutureValue<TSource> ToFutureValue<TSource>(this IQueryable<TSour
 		{
 			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureBatch().AddAsValue(source);
+				return batchProvider.Session.GetFutureBatch().AddAsValue(source);
 			}
 #pragma warning disable CS0618, CS0612// Type or member is obsolete
 			var provider = GetNhProvider(source);
@@ -2451,7 +2452,7 @@ public static IFutureValue<TResult> ToFutureValue<TSource, TResult>(this IQuerya
 		{
 			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureBatch().AddAsValue(source, selector);
+				return batchProvider.Session.GetFutureBatch().AddAsValue(source, selector);
 			}
 #pragma warning disable CS0618 // Type or member is obsolete
 			var expression = ReplacingExpressionVisitor