Full control of entities fetching in Criteria (#1599)

* Obsolete old SetFetchMode/Fetch

Author: bahusoid

doc/reference/modules/performance.xml

@@ -235,20 +235,20 @@ int accessLevel = permissions["accounts"];  // Error!]]></programlisting>
                 <literal>left join fetch</literal> in HQL. This tells NHibernate to fetch 
                 the association eagerly in the first select, using an outer join. In the
                 <literal>ICriteria</literal> query API, you would use
-                <literal>SetFetchMode(FetchMode.Join)</literal>.
+                <literal>Fetch()</literal>.
             </para>
 
             <para>
                 If you ever feel like you wish you could change the fetching strategy used by
                 <literal>Get()</literal> or <literal>Load()</literal>, simply use a 
                 <literal>ICriteria</literal> query, for example:
             </para>
-            
+
             <programlisting><![CDATA[User user = session.CreateCriteria(typeof(User))
-    .SetFetchMode("Permissions", FetchMode.Join)
+    .Fetch(SelectMode.Fetch, "Permissions")
     .Add( Expression.Eq("Id", userId) )
     .UniqueResult<User>();]]></programlisting>
-                
+
             <para>
                 (This is NHibernate's equivalent of what some <emphasis>ORM</emphasis> solutions call a "fetch plan".)
             </para>
@@ -475,7 +475,7 @@ using(var iter = session
                         <literal>NHibernateUtil.Initialize()</literal> for each collection that will
                         be needed in the web tier (this call must occur before the session is closed)
                         or retrieves the collection eagerly using a NHibernate query with a
-                        <literal>FETCH</literal> clause or a <literal>FetchMode.Join</literal> in
+                        <literal>FETCH</literal> clause or a <literal>SelectMode.Fetch</literal> in
                         <literal>ICriteria</literal>. This is usually easier if you adopt the
                         <emphasis>Command</emphasis> pattern instead of a <emphasis>Session Facade</emphasis>.
                     </para>

doc/reference/modules/query_criteria.xml

@@ -175,13 +175,13 @@ foreach ( IDictionary map in cats )
 
         <para>
             You may specify association fetching semantics at runtime using
-            <literal>SetFetchMode()</literal>.
+            <literal>Fetch()</literal>.
         </para>
 
         <programlisting><![CDATA[var cats = sess.CreateCriteria<Cat>()
     .Add( Expression.Like("Name", "Fritz%") )
-    .SetFetchMode("Mate", FetchMode.Eager)
-    .SetFetchMode("Kittens", FetchMode.Eager)
+    .Fetch(SelectMode.Fetch, "Mate")
+    .Fetch(SelectMode.Fetch, "Kittens")
     .List<Cat>();]]></programlisting>
 
         <para>

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

@@ -1089,7 +1089,7 @@ public async Task ProjectionsTestAsync()
 
 			object g = await (s.CreateCriteria(typeof(Student))
 				.Add(Expression.IdEq(667L))
-				.SetFetchMode("enrolments", FetchMode.Join)
+				.Fetch("enrolments")
 				//.setFetchMode("enrolments.course", FetchMode.JOIN) //TODO: would love to make that work...
 				.UniqueResultAsync());
 			Assert.AreSame(gavin, g);
@@ -1279,7 +1279,7 @@ public async Task CloningProjectionsTestAsync()
 
 			ICriteria criteriaToClone6 = s.CreateCriteria(typeof(Student))
 				.Add(Expression.IdEq(667L))
-				.SetFetchMode("enrolments", FetchMode.Join);
+				.Fetch("enrolments");
 			object g = await (CriteriaTransformer.Clone(criteriaToClone6)
 				.UniqueResultAsync());
 			Assert.AreSame(gavin, g);
@@ -2426,7 +2426,7 @@ public async Task SubcriteriaJoinTypesAsync()
 			}
 
 			result = await (session.CreateCriteria(typeof(Student))
-				.SetFetchMode("PreferredCourse", FetchMode.Join)
+				.Fetch("PreferredCourse")
 				.CreateCriteria("PreferredCourse", JoinType.LeftOuterJoin)
 				.AddOrder(Order.Asc("CourseCode"))
 				.ListAsync());
@@ -2436,7 +2436,7 @@ public async Task SubcriteriaJoinTypesAsync()
 			Assert.IsNotNull(result[2]);
 
 			result = await (session.CreateCriteria(typeof(Student))
-				.SetFetchMode("PreferredCourse", FetchMode.Join)
+				.Fetch("PreferredCourse")
 				.CreateAlias("PreferredCourse", "pc", JoinType.LeftOuterJoin)
 				.AddOrder(Order.Asc("pc.CourseCode"))
 				.ListAsync());

src/NHibernate.Test/Async/Criteria/Lambda/IntegrationFixture.cs

@@ -290,7 +290,7 @@ public async Task OverrideEagerJoinAsync()
 			{
 				var persons =
 					await (s.QueryOver<Parent>()
-						.Fetch(p => p.Children).Lazy
+						.Fetch(SelectMode.Skip, p => p.Children)
 						.ListAsync());
 
 				Assert.That(persons.Count, Is.EqualTo(1));