Adjust value names for SelectMode enum

Author: hazzik

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

@@ -144,7 +144,7 @@ public async Task SelectModeFetchLazyPropertiesAsync()
 			using (var session = OpenSession())
 			{
 				var root = await (session.QueryOver<EntityComplex>()
-								.Fetch(SelectMode.FetchLazyProperties, ec => ec)
+								.Fetch(SelectMode.FetchAllLazyProperties, ec => ec)
 								.Where(ec => ec.LazyProp != null)
 								.Take(1)
 								.SingleOrDefaultAsync());
@@ -187,7 +187,7 @@ public async Task SelectModeFetchLazyPropertiesFetchGroupAsync()
 			using (var session = OpenSession())
 			{
 				var root = await (session.QueryOver<EntityComplex>()
-								.Fetch(SelectMode.FetchProperty, ec => ec.LazyProp, ec => ec.LazyProp2, ec => ec.SameTypeChild.LazyProp2)
+								.Fetch(SelectMode.FetchLazyPropertyGroup, ec => ec.LazyProp, ec => ec.LazyProp2, ec => ec.SameTypeChild.LazyProp2)
 								.Where(ec => ec.Id == _parentEntityComplexId)
 								.SingleOrDefaultAsync());
 
@@ -315,7 +315,7 @@ public async Task SelectModeFetchLazyPropertiesForEntityJoinAsync()
 				EntitySimpleChild rootChild = null;
 				rootChild = await (session.QueryOver(() => rootChild)
 							.JoinEntityQueryOver(() => parentJoin, Restrictions.Where(() => rootChild.ParentId == parentJoin.Id))
-							.Fetch(SelectMode.FetchLazyProperties, ec => ec)
+							.Fetch(SelectMode.FetchAllLazyProperties, ec => ec)
 							.Take(1)
 							.SingleOrDefaultAsync());
 				parentJoin = await (session.LoadAsync<EntityComplex>(rootChild.ParentId));

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

@@ -133,7 +133,7 @@ public void SelectModeFetchLazyProperties()
 			using (var session = OpenSession())
 			{
 				var root = session.QueryOver<EntityComplex>()
-								.Fetch(SelectMode.FetchLazyProperties, ec => ec)
+								.Fetch(SelectMode.FetchAllLazyProperties, ec => ec)
 								.Where(ec => ec.LazyProp != null)
 								.Take(1)
 								.SingleOrDefault();
@@ -176,7 +176,7 @@ public void SelectModeFetchLazyPropertiesFetchGroup()
 			using (var session = OpenSession())
 			{
 				var root = session.QueryOver<EntityComplex>()
-								.Fetch(SelectMode.FetchProperty, ec => ec.LazyProp, ec => ec.LazyProp2, ec => ec.SameTypeChild.LazyProp2)
+								.Fetch(SelectMode.FetchLazyPropertyGroup, ec => ec.LazyProp, ec => ec.LazyProp2, ec => ec.SameTypeChild.LazyProp2)
 								.Where(ec => ec.Id == _parentEntityComplexId)
 								.SingleOrDefault();
 
@@ -304,7 +304,7 @@ public void SelectModeFetchLazyPropertiesForEntityJoin()
 				EntitySimpleChild rootChild = null;
 				rootChild = session.QueryOver(() => rootChild)
 							.JoinEntityQueryOver(() => parentJoin, Restrictions.Where(() => rootChild.ParentId == parentJoin.Id))
-							.Fetch(SelectMode.FetchLazyProperties, ec => ec)
+							.Fetch(SelectMode.FetchAllLazyProperties, ec => ec)
 							.Take(1)
 							.SingleOrDefault();
 				parentJoin = session.Load<EntityComplex>(rootChild.ParentId);

src/NHibernate/Impl/CriteriaImpl.cs

@@ -378,7 +378,7 @@ public ICriteria Fetch(SelectMode selectMode, string associationPath, string ali
 				return this;
 			}
 
-			if (selectMode == SelectMode.FetchProperty)
+			if (selectMode == SelectMode.FetchLazyPropertyGroup)
 			{
 				StringHelper.ParsePathAndPropertyName(associationPath, out associationPath, out var propertyName);
 				if (_entityFetchLazyProperties.TryGetValue(associationPath, out var propertyNames))

src/NHibernate/Loader/Criteria/CriteriaJoinWalker.cs

@@ -204,8 +204,8 @@ protected override JoinType GetJoinType(IAssociationType type, FetchMode config,
 					return base.GetJoinType(type, config, path, pathAlias, lhsTable, lhsColumns, nullable, currentDepth, cascadeStyle);
 
 				case SelectMode.Fetch:
-				case SelectMode.FetchLazyProperties:
-				case SelectMode.FetchProperty:
+				case SelectMode.FetchAllLazyProperties:
+				case SelectMode.FetchLazyPropertyGroup:
 				case SelectMode.ChildFetch:
 				case SelectMode.JoinOnly:
 					IsDuplicateAssociation(lhsTable, lhsColumns, type); //deliberately ignore return value!

src/NHibernate/Loader/JoinWalker.cs

@@ -1081,7 +1081,7 @@ private void FillEntityPersisterProperties(int i, OuterJoinableAssociation oj, I
 		{
 			persisters[i] = persister;
 			aliases[i] = oj.RHSAlias;
-			EagerPropertyFetches[i] = oj.SelectMode == SelectMode.FetchLazyProperties;
+			EagerPropertyFetches[i] = oj.SelectMode == SelectMode.FetchAllLazyProperties;
 			ChildFetchEntities[i] = oj.SelectMode == SelectMode.ChildFetch;
 			EntityFetchLazyProperties[i] = oj.EntityFetchLazyProperties;
 		}
@@ -1149,7 +1149,7 @@ protected static string GetSelectFragment(OuterJoinableAssociation join, string
 						join.ShouldFetchCollectionPersister());
 #pragma warning restore 618
 
-				case SelectMode.FetchLazyProperties:
+				case SelectMode.FetchAllLazyProperties:
 #pragma warning disable 618
 					return ReflectHelper.CastOrThrow<ISupportSelectModeJoinable>(join.Joinable, "fetch lazy properties")
 						.SelectFragment(
@@ -1162,7 +1162,7 @@ protected static string GetSelectFragment(OuterJoinableAssociation join, string
 							true);
 #pragma warning restore 618
 
-				case SelectMode.FetchProperty:
+				case SelectMode.FetchLazyPropertyGroup:
 					return ReflectHelper.CastOrThrow<ISupportLazyPropsJoinable>(join.Joinable, "fetch lazy property")
 										.SelectFragment(
 											next?.Joinable,

src/NHibernate/Loader/OuterJoinableAssociation.cs

@@ -186,7 +186,7 @@ internal bool ShouldFetchCollectionPersister()
 					return JoinType == JoinType.LeftOuterJoin;
 
 				case SelectMode.Fetch:
-				case SelectMode.FetchLazyProperties:
+				case SelectMode.FetchAllLazyProperties:
 					return true;
 
 				case SelectMode.ChildFetch:

src/NHibernate/SelectMode.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace NHibernate
 {
 	/// <summary>
@@ -18,6 +20,7 @@ public enum SelectMode
 		/// <summary>
 		/// Fetch the entity and its lazy properties.
 		/// </summary>
+		[Obsolete("Please use FetchAllLazyProperties")]
 		FetchLazyProperties,
 
 		/// <summary>
@@ -41,6 +44,13 @@ public enum SelectMode
 		/// Fetch lazy property group
 		/// Note: To fetch single property it must be mapped with unique fetch group (lazy-group)
 		/// </summary>
-		FetchProperty,
+		FetchLazyPropertyGroup,
+	
+		/// <summary>
+		/// Fetch the entity and its lazy properties.
+		/// </summary>
+#pragma warning disable 618
+		FetchAllLazyProperties = FetchLazyProperties,
+#pragma warning restore 618
 	}
 }