Expose Fetch method returning QueryOver

Author: bahusoid

src/NHibernate.Test/Async/Criteria/SelectModeTest/SelectModeTest.cs

@@ -54,6 +54,27 @@ public async Task SelectModeJoinOnlyAsync()
 			}
 		}
 
+		[Test]
+		public async Task SelectModeDetachedQueryOverAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex root = null;
+				root = await (QueryOver.Of(() => root)
+								.Where(x => x.Id == _parentEntityComplexId)
+								.Fetch(SelectMode.Fetch, r => r.Child1)
+								.GetExecutableQueryOver(session)
+								.SingleOrDefaultAsync());
+
+				Assert.That(root, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(root), Is.True);
+				Assert.That(root.Child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(root.Child1), Is.True, "Joined ManyToOne Child1 should not be fetched.");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
 		[Test]
 		public async Task SelectModeFetchAsync()
 		{

src/NHibernate.Test/Criteria/SelectModeTest/SelectModeTest.cs

@@ -43,6 +43,27 @@ public void SelectModeJoinOnly()
 			}
 		}
 
+		[Test]
+		public void SelectModeDetachedQueryOver()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				EntityComplex root = null;
+				root = QueryOver.Of(() => root)
+								.Where(x => x.Id == _parentEntityComplexId)
+								.Fetch(SelectMode.Fetch, r => r.Child1)
+								.GetExecutableQueryOver(session)
+								.SingleOrDefault();
+
+				Assert.That(root, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(root), Is.True);
+				Assert.That(root.Child1, Is.Not.Null);
+				Assert.That(NHibernateUtil.IsInitialized(root.Child1), Is.True, "Joined ManyToOne Child1 should not be fetched.");
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
+
 		[Test]
 		public void SelectModeFetch()
 		{

src/NHibernate/Criterion/QueryOver.cs

@@ -1012,7 +1012,12 @@ IQueryOverJoinBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.Right
 		IQueryOverJoinBuilder<TRoot,TSubType> IQueryOver<TRoot,TSubType>.Full
 		{ get { return new IQueryOverJoinBuilder<TRoot,TSubType>(this, JoinType.FullJoin); } }
 
-		public IQueryOver<TRoot, TSubType> Fetch(SelectMode mode, Expression<Func<TSubType, object>> path)
+		IQueryOver<TRoot, TSubType> ISupportSelectModeQueryOver<TRoot, TSubType>.Fetch(SelectMode mode, Expression<Func<TSubType, object>> path)
+		{
+			return Fetch(mode, path);
+		}
+
+		public QueryOver<TRoot, TSubType> Fetch(SelectMode mode, Expression<Func<TSubType, object>> path)
 		{
 			UnderlyingCriteria.Fetch(mode, ExpressionProcessor.FindMemberExpression(path.Body), null);
 			return this;