Adjustment to entity projection initialization. To be squashed.

Author: fredericDelaporte

src/NHibernate/Criterion/EntityProjection.cs

@@ -83,33 +83,36 @@ public EntityProjection SetFetchLazyProperties(bool fetchLazyProperties = true)
 
 		IType[] IProjection.GetTypes(string alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			return new[] { criteriaQuery.GetType(criteria, alias) };
+			SetFields(criteriaQuery);
+			return _entityAlias == alias
+				? _types
+				: null;
 		}
 
 		IType[] IProjection.GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			SetFields(criteria, criteriaQuery);
+			SetFields(criteriaQuery);
 
 			return _types;
 		}
 
 		string[] IProjection.GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			SetFields(criteria, criteriaQuery);
+			SetFields(criteriaQuery);
 
 			return _identifierColumnAliases;
 		}
 
 		string[] IProjection.GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			SetFields(criteria, criteriaQuery);
+			SetFields(criteriaQuery);
 
 			return _identifierColumnAliases;
 		}
 
 		SqlString IProjection.ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery)
 		{
-			SetFields(criteria, criteriaQuery);
+			SetFields(criteriaQuery);
 
 			string identifierSelectFragment = Persister.IdentifierSelectFragment(TableAlias, ColumnAliasSuffix);
 			return new SqlString(
@@ -132,20 +135,21 @@ TypedValue[] IProjection.GetTypedValues(ICriteria criteria, ICriteriaQuery crite
 
 		#endregion IProjection implementation
 
-		private void SetFields(ICriteria criteria, ICriteriaQuery criteriaQuery)
+		private void SetFields(ICriteriaQuery criteriaQuery)
 		{
 			//Persister is required, so let's use it as "initialized marker"
 			if (Persister != null)
 				return;
 
-			if (Lazy == false)
+			if (!(criteriaQuery is ISupportEntityProjectionCriteriaQuery entityProjectionQuery))
 			{
-				var entityProjectionQuery = criteriaQuery as ISupportEntityProjectionCriteriaQuery;
-				if (entityProjectionQuery == null)
-				{
-					throw new HibernateException($"Projecting to entities requires a '{criteriaQuery.GetType().FullName}' type to implement {nameof(ISupportEntityProjectionCriteriaQuery)} interface.");
-				}
+				throw new HibernateException($"Projecting to entities requires a '{criteriaQuery.GetType().FullName}' type to implement {nameof(ISupportEntityProjectionCriteriaQuery)} interface.");
+			}
+
+			var criteria = entityProjectionQuery.RootCriteria;
 
+			if (!Lazy)
+			{
 				entityProjectionQuery.RegisterEntityProjection(this);
 			}
 
@@ -175,7 +179,7 @@ private void SetFields(ICriteria criteria, ICriteriaQuery criteriaQuery)
 
 			_identifierColumnAliases = Persister.GetIdentifierAliases(ColumnAliasSuffix);
 
-			_types = new IType[] { TypeFactory.ManyToOne(Persister.EntityName, true), };
+			_types = new IType[] { TypeFactory.ManyToOne(Persister.EntityName, true) };
 		}
 	}
 }

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -113,6 +113,8 @@ public CriteriaImpl RootCriteria
 			get { return rootCriteria; }
 		}
 
+		ICriteria ISupportEntityProjectionCriteriaQuery.RootCriteria => rootCriteria;
+
 		public QueryParameters GetQueryParameters()
 		{
 			RowSelection selection = new RowSelection();
@@ -879,4 +881,4 @@ private void CreateSubQuerySpaces()
 
 		}	
 	}
-}
+}

src/NHibernate/Loader/Criteria/ISupportEntityProjectionCriteriaQuery.cs

@@ -6,5 +6,7 @@ namespace NHibernate.Loader.Criteria
 	public interface ISupportEntityProjectionCriteriaQuery
 	{
 		void RegisterEntityProjection(EntityProjection projection);
+
+		ICriteria RootCriteria { get; }
 	}
 }