Fixed Clone for SelectMode

Author: bahusoid

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

@@ -79,6 +79,33 @@ public async Task SelectModeFetchAsync()
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
 		}
+
+		//Check that SelecMode survives query cloning
+		[Test]
+		public async Task SelectModeFetch_ClonedQueryOverAsync()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				var list = await (session.QueryOver<EntityComplex>()
+								.With(SelectMode.Fetch, ec => ec.Child1)
+								.JoinQueryOver(ec => ec.ChildrenList, JoinType.InnerJoin)
+								//now we can fetch inner joined collection
+								.With(SelectMode.Fetch, childrenList => childrenList)
+								.TransformUsing(Transformers.DistinctRootEntity)
+								.Clone()
+								.ListAsync());
+
+				var root = list.FirstOrDefault();
+				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, "Entity must be initialized");
+				Assert.That(NHibernateUtil.IsInitialized(root.ChildrenList), Is.True, "ChildrenList Inner Joined collection must be initialized");
+
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
 
 		[Test]
 		public async Task SelectModeDefaultAsync()

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

@@ -68,6 +68,33 @@ public void SelectModeFetch()
 				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
 			}
 		}
+
+		//Check that SelecMode survives query cloning
+		[Test]
+		public void SelectModeFetch_ClonedQueryOver()
+		{
+			using (var sqlLog = new SqlLogSpy())
+			using (var session = OpenSession())
+			{
+				var list = session.QueryOver<EntityComplex>()
+								.With(SelectMode.Fetch, ec => ec.Child1)
+								.JoinQueryOver(ec => ec.ChildrenList, JoinType.InnerJoin)
+								//now we can fetch inner joined collection
+								.With(SelectMode.Fetch, childrenList => childrenList)
+								.TransformUsing(Transformers.DistinctRootEntity)
+								.Clone()
+								.List();
+
+				var root = list.FirstOrDefault();
+				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, "Entity must be initialized");
+				Assert.That(NHibernateUtil.IsInitialized(root.ChildrenList), Is.True, "ChildrenList Inner Joined collection must be initialized");
+
+				Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
+			}
+		}
 
 		[Test]
 		public void SelectModeDefault()

src/NHibernate/Impl/CriteriaImpl.cs

@@ -561,6 +561,7 @@ public object Clone()
 			{
 				clone.lockModes.Add(de.Key, de.Value);
 			}
+			clone.selectModes.AddOrOverride(selectModes);
 			clone.maxResults = maxResults;
 			clone.firstResult = firstResult;
 			clone.timeout = timeout;