minimize overall change noize

Author: bahusoid

src/NHibernate/Impl/CriteriaImpl.cs

@@ -43,8 +43,6 @@ public partial class CriteriaImpl : ICriteria, ISupportEntityJoinCriteria
 		private readonly Dictionary<string, ICriteria> subcriteriaByPath = new Dictionary<string, ICriteria>();
 		private readonly Dictionary<string, ICriteria> subcriteriaByAlias = new Dictionary<string, ICriteria>();
 
-		private readonly Dictionary<string,string> entityJoinAliasToEntityNameMap = new Dictionary<string, string>();
-
 		private readonly string entityOrClassName;
 
 		// Projection Fields
@@ -75,11 +73,6 @@ public CriteriaImpl(string entityOrClassName, string alias, ISessionImplementor
 			subcriteriaByAlias[alias] = this;
 		}
 
-		public IDictionary<string,string> GetEntityJoinAliasToEntityNameMap()
-		{
-			return entityJoinAliasToEntityNameMap;
-		}
-
 		public ISessionImplementor Session
 		{
 			get { return session; }
@@ -672,11 +665,7 @@ internal Subcriteria(CriteriaImpl root, ICriteria parent, string path, string al
 
 				root.subcriteriaList.Add(this);
 
-				if (JoinEntityName == null)
-					root.subcriteriaByPath[path] = this;
-				else
-					root.entityJoinAliasToEntityNameMap[alias] = JoinEntityName;
-
+				root.subcriteriaByPath[path] = this;
 				SetAlias(alias);
 			}
 

src/NHibernate/Loader/Criteria/CriteriaJoinWalker.cs

@@ -79,13 +79,16 @@ public CriteriaJoinWalker(IOuterJoinLoadable persister, CriteriaQueryTranslator
 		protected override void AddAssociations()
 		{
 			base.AddAssociations();
-			foreach (var x in translator.GetEntityJoins())
+			foreach (var entityJoinInfo in translator.GetEntityJoins().Values)
 			{
-				CriteriaQueryTranslator.EntityJoinInfo info = x.Value;
-				AddExplicitEntityJoinAssociation(info.Persister, info.TableAlias, info.JoinType, info.WithClause);
-				IncludeInResultIfNeeded(info.Persister, info.Criteria, info.TableAlias);
+				var tableAlias = translator.GetSQLAlias(entityJoinInfo.Criteria);
+				var criteriaPath = entityJoinInfo.Criteria.Alias; //path for entity join is equal to alias
+				var persister
+					= entityJoinInfo.Persister as IOuterJoinLoadable;
+				AddExplicitEntityJoinAssociation(persister, tableAlias, translator.GetJoinType(criteriaPath), GetWithClause(criteriaPath));
+				IncludeInResultIfNeeded(persister, entityJoinInfo.Criteria, tableAlias);
 				//collect mapped associations for entity join
-				WalkEntityTree(info.Persister, info.TableAlias, info.Criteria.Alias, 1);
+				WalkEntityTree(persister, tableAlias, criteriaPath, 1);
 			}
 		}
 

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -21,10 +21,7 @@ public class CriteriaQueryTranslator : ICriteriaQuery, ISupportEntityProjectionC
 		public class EntityJoinInfo
 		{
 			public ICriteria Criteria;
-			public string TableAlias;
-			public SqlString WithClause;
-			public JoinType JoinType;
-			public IOuterJoinLoadable Persister;
+			public IQueryable Persister;
 		}
 
 		public static readonly string RootSqlAlias = CriteriaSpecification.RootAlias + '_';
@@ -73,22 +70,22 @@ public CriteriaQueryTranslator(ISessionFactoryImplementor factory, CriteriaImpl
 									   string rootSQLAlias)
 		{
 			rootCriteria = criteria;
-			
+
 			sessionFactory = factory;
+			rootPersister = GetQueryablePersister(rootEntityName);
 			this.rootSQLAlias = rootSQLAlias;
 			helper = new SessionFactoryHelper(factory);
-			rootPersister = GetQueryablePersister(rootEntityName);
 
 			collectedParameterSpecifications = new List<IParameterSpecification>();
 			namedParameters = new List<NamedParameter>();
 
 			CreateAliasCriteriaMap();
 			CreateAssociationPathCriteriaMap();
+			CreateEntityJoinMap();
 			CreateCriteriaEntityNameMap();
 			CreateCriteriaCollectionPersisters();
 			CreateCriteriaSQLAliasMap();
 			CreateSubQuerySpaces();
-			FillExplicitEntityJoinsDetails();
 		}
 
 		[CLSCompliant(false)] // TODO: Why does this cause a problem in 1.1
@@ -128,7 +125,7 @@ public CriteriaImpl RootCriteria
 
 		ICriteria ISupportEntityProjectionCriteriaQuery.RootCriteria => rootCriteria;
 
-		public IReadOnlyDictionary<string, EntityJoinInfo> GetEntityJoins()
+		internal IReadOnlyDictionary<string, EntityJoinInfo> GetEntityJoins()
 		{
 			return entityJoins;
 		}
@@ -322,11 +319,6 @@ private void CreateAssociationPathCriteriaMap()
 		{
 			foreach (CriteriaImpl.Subcriteria crit in rootCriteria.IterateSubcriteria())
 			{
-				if (crit.IsEntityJoin)
-				{
-					continue;
-				}
-
 				string wholeAssociationPath = GetWholeAssociationPath(crit);
 				try
 				{
@@ -403,20 +395,10 @@ private string GetWholeAssociationPath(CriteriaImpl.Subcriteria subcriteria)
 		private void CreateCriteriaEntityNameMap()
 		{
 			// initialize the rootProvider first
-			ICriteriaInfoProvider rootProvider = MapEntityToCriteria(rootPersister, rootCriteria);
-
-			foreach (var a in rootCriteria.GetEntityJoinAliasToEntityNameMap())
-			{
-				var criteria = rootCriteria.GetCriteriaByAlias(a.Key);
-				var persister = GetQueryablePersister(a.Value);
-				MapEntityToCriteria(persister, criteria);
+			ICriteriaInfoProvider rootProvider = new EntityCriteriaInfoProvider(rootPersister);
+			criteriaInfoMap.Add(rootCriteria, rootProvider);
+			nameCriteriaInfoMap.Add(rootProvider.Name, rootProvider);
 
-				entityJoins[a.Key] = new EntityJoinInfo
-				{
-					Persister = persister as IOuterJoinLoadable,
-					Criteria = criteria,
-				};
-			}
 
 			foreach (KeyValuePair<string, ICriteria> me in associationPathCriteriaMap)
 			{
@@ -426,6 +408,22 @@ private void CreateCriteriaEntityNameMap()
 			}
 		}
 
+		//explicit joins with not associated entities
+		private void CreateEntityJoinMap()
+		{
+			foreach (var criteria in rootCriteria.IterateSubcriteria())
+			{
+				if (criteria.IsEntityJoin)
+				{
+					var entityJoinPersister = GetQueryablePersister(criteria.JoinEntityName);
+					entityJoins[criteria.Alias] = new EntityJoinInfo
+					{
+						Persister = entityJoinPersister,
+						Criteria = criteria,
+					};
+				}
+			}
+		}
 
 		private void CreateCriteriaCollectionPersisters()
 		{
@@ -501,7 +499,7 @@ private ICriteriaInfoProvider GetPathInfo(string path, ICriteriaInfoProvider roo
 			int i = 0;
 			if (entityJoins.TryGetValue(tokens[0], out var entityJoinInfo))
 			{
-				provider = criteriaInfoMap[entityJoinInfo.Criteria];
+				provider = new EntityCriteriaInfoProvider(entityJoinInfo.Persister);
 				++i;
 			}
 
@@ -553,32 +551,6 @@ private ICriteriaInfoProvider GetPathInfo(string path, ICriteriaInfoProvider roo
 			return provider;
 		}
 
-		private void FillExplicitEntityJoinsDetails()
-		{
-			if (entityJoins.Count == 0)
-				return;
-
-			foreach (var subcriteria in rootCriteria.IterateSubcriteria())
-			{
-				if (subcriteria.IsEntityJoin)
-				{
-					var entityJoin = entityJoins[subcriteria.Alias];
-					entityJoin.JoinType = subcriteria.JoinType;
-					entityJoin.WithClause = subcriteria.WithClause.ToSqlString(entityJoin.Criteria, this);
-					entityJoin.TableAlias = GetSQLAlias(entityJoin.Criteria);
-				}
-			}
-		}
-
-		private ICriteriaInfoProvider MapEntityToCriteria(IQueryable persister, ICriteria criteria)
-		{
-			var provider = new EntityCriteriaInfoProvider(persister);
-
-			criteriaInfoMap.Add(criteria, provider);
-			nameCriteriaInfoMap[provider.Name] = provider;
-			return provider;
-		}
-
 		private void CreateCriteriaSQLAliasMap()
 		{
 			int i = 0;