improve adding of with clauses

Author: g.yakimov

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -766,7 +766,7 @@ private bool TryGetColumns(ICriteria subcriteria, string path, bool verifyProper
 				return false;
 			}
 
-			columns = propertyMapping.ToColumns(GetSQLAlias(pathCriteria), propertyName);
+			columns = propertyMapping.ToColumns(pathCriteria, propertyName, GetSQLAlias);
 			return true;
 		}
 

src/NHibernate/Persister/Entity/AbstractPropertyMapping.cs

@@ -44,6 +44,12 @@ public bool TryToType(string propertyName, out IType type)
 			return typesByPropertyPath.TryGetValue(propertyName, out type);
 		}
 
+		public virtual string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
+		{
+			string alias = getSQLAlias(pathCriteria);
+			return ToColumns(alias, propertyName);
+		}
+
 		public virtual string[] ToColumns(string alias, string propertyName)
 		{
 			//TODO: *two* hashmap lookups here is one too many...

src/NHibernate/Persister/Entity/BasicEntityPropertyMapping.cs

@@ -1,4 +1,7 @@
+using System;
+using NHibernate.Criterion;
 using NHibernate.Type;
+using static NHibernate.Impl.CriteriaImpl;
 
 namespace NHibernate.Persister.Entity
 {
@@ -26,6 +29,17 @@ public override IType Type
 			get { return persister.Type; }
 		}
 
+		public override string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
+		{
+			var withClause = pathCriteria as Subcriteria != null ? ((Subcriteria)pathCriteria).WithClause as SimpleExpression : null;
+			if (withClause != null && withClause.PropertyName == propertyName)
+			{
+				return base.ToColumns(persister.GenerateTableAlias(getSQLAlias(pathCriteria), 0), propertyName);
+			}
+
+			return base.ToColumns(pathCriteria, propertyName, getSQLAlias);
+		}
+
 		public override string[] ToColumns(string alias, string propertyName)
 		{
 			return

src/NHibernate/Persister/Entity/IPropertyMapping.cs

@@ -29,6 +29,8 @@ public interface IPropertyMapping
 		/// <returns>true if a type was found, false if not</returns>
 		bool TryToType(string propertyName, out IType type);
 
+		string[] ToColumns(ICriteria pathCriteria, string propertyName, System.Func<ICriteria, string> getSQLAlias);
+
 		/// <summary>
 		/// Given a query alias and a property path, return the qualified column name
 		/// </summary>
@@ -40,4 +42,4 @@ public interface IPropertyMapping
 		/// <summary> Given a property path, return the corresponding column name(s).</summary>
 		string[] ToColumns(string propertyName);
 	}
-}
+}

src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs

@@ -504,11 +504,6 @@ protected override void AddDiscriminatorToSelect(SelectFragment select, string n
 			}
 		}
 
-		public override int GetSubclassPropertyTableNumber(string propertyPath)
-		{
-			return 0;
-		}
-
 		private CaseFragment DiscriminatorFragment(string alias)
 		{
 			CaseFragment cases = Factory.Dialect.CreateCaseFragment();