NH-3669 - Make Query<> methods interface members of ISession and IStatelessSession

Author: hazzik

src/NHibernate/Async/ISession.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Linq.Expressions;
 using NHibernate.Engine;
 using NHibernate.Stat;

src/NHibernate/Async/IStatelessSession.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Linq.Expressions;
 using NHibernate.Engine;
 
@@ -113,4 +114,4 @@ public partial interface IStatelessSession : IDisposable
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		Task RefreshAsync(string entityName, object entity, LockMode lockMode, CancellationToken cancellationToken = default(CancellationToken));
 	}
-}
+}

src/NHibernate/Async/Impl/AbstractSessionImpl.cs

@@ -12,6 +12,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Linq;
 using NHibernate.AdoNet;
 using NHibernate.Cache;
 using NHibernate.Collection;
@@ -21,6 +22,7 @@
 using NHibernate.Event;
 using NHibernate.Exceptions;
 using NHibernate.Hql;
+using NHibernate.Linq;
 using NHibernate.Loader.Custom;
 using NHibernate.Loader.Custom.Sql;
 using NHibernate.Persister.Entity;

src/NHibernate/ISession.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Linq.Expressions;
 using NHibernate.Engine;
 using NHibernate.Stat;
@@ -962,5 +963,20 @@ public partial interface ISession : IDisposable
 		/// <returns>The new session.</returns>
 		[Obsolete("Please use SessionWithOptions instead. Now requires to be flushed and disposed of.")]
 		ISession GetSession(EntityMode entityMode);
+
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class.
+		/// </summary>
+		/// <typeparam name="T">The entity class</typeparam>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		IQueryable<T> Query<T>();
+
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class and with given entity name.
+		/// </summary>
+		/// <typeparam name="T">The type of entity to query.</typeparam>
+		/// <param name="entityName">The entity name.</param>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		IQueryable<T> Query<T>(string entityName);
 	}
 }

src/NHibernate/IStatelessSession.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Linq.Expressions;
 using NHibernate.Engine;
 
@@ -272,5 +273,20 @@ public partial interface IStatelessSession : IDisposable
 		/// <param name="batchSize">The batch size.</param>
 		/// <returns>The same instance of the session for methods chain.</returns>
 		IStatelessSession SetBatchSize(int batchSize);
+
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class.
+		/// </summary>
+		/// <typeparam name="T">The entity class</typeparam>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		IQueryable<T> Query<T>();
+
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class and with given entity name.
+		/// </summary>
+		/// <typeparam name="T">The type of entity to query.</typeparam>
+		/// <param name="entityName">The entity name.</param>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		IQueryable<T> Query<T>(string entityName);
 	}
-}
+}

src/NHibernate/Impl/AbstractSessionImpl.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Linq;
 using NHibernate.AdoNet;
 using NHibernate.Cache;
 using NHibernate.Collection;
@@ -11,6 +12,7 @@
 using NHibernate.Event;
 using NHibernate.Exceptions;
 using NHibernate.Hql;
+using NHibernate.Linq;
 using NHibernate.Loader.Custom;
 using NHibernate.Loader.Custom.Sql;
 using NHibernate.Persister.Entity;
@@ -444,5 +446,26 @@ internal IOuterJoinLoadable GetOuterJoinLoadable(string entityName)
 		public abstract IEnumerable<T> Enumerable<T>(IQueryExpression queryExpression, QueryParameters queryParameters);
 
 		public abstract int ExecuteUpdate(IQueryExpression queryExpression, QueryParameters queryParameters);
+		
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class.
+		/// </summary>
+		/// <typeparam name="T">The entity class</typeparam>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		public IQueryable<T> Query<T>()
+		{
+			return new NhQueryable<T>(this);
+		}
+
+		/// <summary>
+		/// Creates a new Linq <see cref="IQueryable{T}"/> for the entity class and with given entity name.
+		/// </summary>
+		/// <typeparam name="T">The type of entity to query.</typeparam>
+		/// <param name="entityName">The entity name.</param>
+		/// <returns>An <see cref="IQueryable{T}"/> instance</returns>
+		public IQueryable<T> Query<T>(string entityName)
+		{
+			return new NhQueryable<T>(this, entityName);
+		}
 	}
 }

src/NHibernate/Linq/LinqExtensionMethods.cs

@@ -2395,26 +2395,6 @@ async Task<List<TSource>> InternalToListAsync()
 
 		#endregion
 
-		public static IQueryable<T> Query<T>(this ISession session)
-		{
-			return new NhQueryable<T>(session.GetSessionImplementation());
-		}
-
-		public static IQueryable<T> Query<T>(this ISession session, string entityName)
-		{
-			return new NhQueryable<T>(session.GetSessionImplementation(), entityName);
-		}
-
-		public static IQueryable<T> Query<T>(this IStatelessSession session)
-		{
-			return new NhQueryable<T>(session.GetSessionImplementation());
-		}
-
-		public static IQueryable<T> Query<T>(this IStatelessSession session, string entityName)
-		{
-			return new NhQueryable<T>(session.GetSessionImplementation(), entityName);
-		}
-
 		/// <summary>
 		/// Wraps the query in a deferred <see cref="IFutureEnumerable{T}"/> which enumeration will trigger a batch of all pending future queries.
 		/// </summary>