Fix compilation after rebase

Author: fredericDelaporte

src/NHibernate/Loader/Criteria/CriteriaJoinWalker.cs

@@ -80,9 +80,15 @@ protected override void AddAssociations()
 			foreach (var entityJoinInfo in translator.GetEntityJoins().Values)
 			{
 				var tableAlias = translator.GetSQLAlias(entityJoinInfo.Criteria);
-				var criteriaPath = entityJoinInfo.Criteria.Alias;
+				var criteriaPath = entityJoinInfo.Criteria.Path;
+				var criteriaAlias = entityJoinInfo.Criteria.Alias;
 				var persister = entityJoinInfo.Persister as IOuterJoinLoadable;
-				AddExplicitEntityJoinAssociation(persister, tableAlias, translator.GetJoinType(criteriaPath), criteriaPath);
+				AddExplicitEntityJoinAssociation(
+					persister,
+					tableAlias,
+					translator.GetJoinType(criteriaPath, criteriaAlias),
+					criteriaPath,
+					criteriaAlias);
 				IncludeInResultIfNeeded(persister, entityJoinInfo.Criteria, tableAlias, criteriaPath);
 				//collect mapped associations for entity join
 				WalkEntityTree(persister, tableAlias, criteriaPath, 1);

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -18,12 +18,20 @@ namespace NHibernate.Loader.Criteria
 {
 	public class CriteriaQueryTranslator : ICriteriaQuery, ISupportEntityProjectionCriteriaQuery
 	{
+		// Since v5.2
+		[Obsolete("This class has no usage and will be removed")]
 		public class EntityJoinInfo
 		{
 			public ICriteria Criteria;
 			public IQueryable Persister;
 		}
 
+		internal class EntityJoinInformation
+		{
+			internal CriteriaImpl.Subcriteria Criteria;
+			internal IQueryable Persister;
+		}
+
 		public static readonly string RootSqlAlias = CriteriaSpecification.RootAlias + '_';
 		private static readonly INHibernateLogger logger = NHibernateLogger.For(typeof(CriteriaQueryTranslator));
 
@@ -57,7 +65,7 @@ public class EntityJoinInfo
 		private readonly ICollection<NamedParameter> namedParameters;
 		private readonly ISet<string> subQuerySpaces = new HashSet<string>();
 
-		private Dictionary<string, EntityJoinInfo> entityJoins = new Dictionary<string, EntityJoinInfo>();
+		private Dictionary<string, EntityJoinInformation> entityJoins = new Dictionary<string, EntityJoinInformation>();
 		private readonly IQueryable rootPersister;
 
 		//Key for the dictionary sub-criteria
@@ -169,7 +177,7 @@ public CriteriaImpl RootCriteria
 
 		ICriteria ISupportEntityProjectionCriteriaQuery.RootCriteria => rootCriteria;
 
-		internal IReadOnlyDictionary<string, EntityJoinInfo> GetEntityJoins()
+		internal IReadOnlyDictionary<string, EntityJoinInformation> GetEntityJoins()
 		{
 			return entityJoins;
 		}
@@ -501,7 +509,7 @@ private void CreateEntityJoinMap()
 				if (criteria.IsEntityJoin)
 				{
 					var entityJoinPersister = GetQueryablePersister(criteria.JoinEntityName);
-					entityJoins[criteria.Alias] = new EntityJoinInfo
+					entityJoins[criteria.Alias] = new EntityJoinInformation
 					{
 						Persister = entityJoinPersister,
 						Criteria = criteria,

src/NHibernate/Loader/JoinWalker.cs

@@ -142,7 +142,7 @@ private void AddAssociationToJoinTreeIfNecessary(IAssociationType type, string[]
 			}
 		}
 
-		protected virtual SqlString GetWithClause(string path, string sqlAlias)
+		protected virtual SqlString GetWithClause(string path, string pathAlias)
 		{
 			return SqlString.Empty;
 		}
@@ -308,7 +308,8 @@ internal void AddExplicitEntityJoinAssociation(
 			IOuterJoinLoadable persister,
 			string tableAlias,
 			JoinType joinType,
-			string path)
+			string path,
+			string alias)
 		{
 			OuterJoinableAssociation assoc =
 				new OuterJoinableAssociation(
@@ -317,7 +318,7 @@ internal void AddExplicitEntityJoinAssociation(
 					Array.Empty<string>(),
 					tableAlias,
 					joinType,
-					GetWithClause(path),
+					GetWithClause(path, alias),
 					Factory,
 					enabledFilters,
 					GetSelectMode(path));