special handling of with clauses

g.yakimov · g.yakimov · commit 7bc3fddd107b · 2020-04-16T19:49:03.000+03:00
diff --git a/src/NHibernate.Test/App.config b/src/NHibernate.Test/App.config
@@ -7,7 +7,7 @@
 	</configSections>
 
 	<connectionStrings>
-		<add name="TestConnectionString" connectionString="Server=localhost\sqlexpress;Database=nhibernate;Integrated Security=SSPI" />
+		<add name="TestConnectionString" connectionString="Server=localhost;Database=nhibernate;Integrated Security=SSPI" />
 		<add name="DummyConnectionString" connectionString="TestConnectionString-TestConnectionString" />
 	</connectionStrings>
 
@@ -31,7 +31,7 @@
 			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
 
 			<property name="connection.driver_class">NHibernate.Driver.Sql2008ClientDriver</property> <!-- Shouldn't be necessary, but is required by some tests -->
-			<property name="connection.connection_string">Server=localhost\sqlexpress;Database=nhibernate;Integrated Security=SSPI</property>
+			<property name="connection.connection_string">Server=localhost;Database=nhibernate;Integrated Security=SSPI</property>
 			<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Test</property>
 			<property name="connection.isolation">ReadCommitted</property> <!-- See System.Data.IsolationLevel for valid values -->
 
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs
@@ -61,7 +61,7 @@ public AssignmentSpecification(IASTNode eq, IQueryable persister)
 			}
 			else
 			{
-				temp.Add(persister.GetSubclassTableName(persister.GetSubclassPropertyTableNumber(propertyPath)));
+				temp.Add(persister.GetSubclassTableName(persister.GetSubclassPropertyTableNumber(propertyPath, false)));
 			}
 			_tableNames = new HashSet<string>(temp);
 
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/ComponentJoin.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/ComponentJoin.cs
@@ -150,14 +150,14 @@ public bool TryToType(string propertyName, out IType type)
 					return fromElementType.GetBasePropertyMapping().TryToType(GetPropertyPath(propertyName), out type);
 				}
 
-				public string[] ToColumns(string alias, string propertyName)
+				public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)
 				{
-					return fromElementType.GetBasePropertyMapping().ToColumns(alias, GetPropertyPath(propertyName));
+					return fromElementType.GetBasePropertyMapping().ToColumns(alias, GetPropertyPath(propertyName), useLastIndex);
 				}
 
-				public string[] ToColumns(string propertyName)
+				public string[] ToColumns(string propertyName, bool useLastIndex = false)
 				{
-					return fromElementType.GetBasePropertyMapping().ToColumns(GetPropertyPath(propertyName));
+					return fromElementType.GetBasePropertyMapping().ToColumns(GetPropertyPath(propertyName), useLastIndex);
 				}
 
 				#endregion
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
@@ -214,7 +214,7 @@ private bool IsSuperclassProperty(string propertyName)
 			//
 			// we may want to disallow it for discrim-subclass just for
 			// consistency-sake (currently does not work anyway)...
-			return _persister.GetSubclassPropertyTableNumber(propertyName) != 0;
+			return _persister.GetSubclassPropertyTableNumber(propertyName, false) != 0;
 		}
 
 		/// <summary>
@@ -263,4 +263,4 @@ private static bool AreSqlTypesCompatible(SqlType target, SqlType source)
 			return target.Equals(source);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs b/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
@@ -13,6 +13,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 using IQueryable = NHibernate.Persister.Entity.IQueryable;
+using static NHibernate.Impl.CriteriaImpl;
 
 namespace NHibernate.Loader.Criteria
 {
@@ -766,7 +767,15 @@ private bool TryGetColumns(ICriteria subcriteria, string path, bool verifyProper
 				return false;
 			}
 
-			columns = propertyMapping.ToColumns(GetSQLAlias(pathCriteria), propertyName);
+			// here we can check if the condition belongs to a with clause
+			bool useLastIndex = false;
+			var withClause = pathCriteria as Subcriteria != null ? ((Subcriteria) pathCriteria).WithClause as SimpleExpression : null;
+			if (withClause != null && withClause.PropertyName == propertyName)
+			{
+				useLastIndex = true;
+			}
+
+			columns = propertyMapping.ToColumns(GetSQLAlias(pathCriteria), propertyName, useLastIndex);
 			return true;
 		}
 
diff --git a/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs b/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs
@@ -1386,7 +1386,7 @@ public bool IsManyToManyFiltered(IDictionary<string, IFilter> enabledFilters)
 			return IsManyToMany && (manyToManyWhereString != null || manyToManyFilterHelper.IsAffectedBy(enabledFilters));
 		}
 
-		public string[] ToColumns(string alias, string propertyName)
+		public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)
 		{
 			if ("index".Equals(propertyName))
 			{
@@ -1397,10 +1397,10 @@ public string[] ToColumns(string alias, string propertyName)
 
 				return StringHelper.Qualify(alias, indexColumnNames);
 			}
-			return elementPropertyMapping.ToColumns(alias, propertyName);
+			return elementPropertyMapping.ToColumns(alias, propertyName, useLastIndex);
 		}
 
-		public string[] ToColumns(string propertyName)
+		public string[] ToColumns(string propertyName, bool useLastIndex = false)
 		{
 			if ("index".Equals(propertyName))
 			{
@@ -1412,7 +1412,7 @@ public string[] ToColumns(string propertyName)
 				return indexColumnNames;
 			}
 
-			return elementPropertyMapping.ToColumns(propertyName);
+			return elementPropertyMapping.ToColumns(propertyName, useLastIndex);
 		}
 
 		protected abstract SqlCommandInfo GenerateDeleteString();
diff --git a/src/NHibernate/Persister/Collection/CollectionPropertyMapping.cs b/src/NHibernate/Persister/Collection/CollectionPropertyMapping.cs
@@ -57,7 +57,7 @@ public bool TryToType(string propertyName, out IType type)
 			}
 		}
 
-		public string[] ToColumns(string alias, string propertyName)
+		public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)
 		{
 			string[] cols;
 			switch (propertyName)
@@ -107,7 +107,7 @@ public string[] ToColumns(string alias, string propertyName)
 			}
 		}
 
-		public string[] ToColumns(string propertyName)
+		public string[] ToColumns(string propertyName, bool useLastIndex = false)
 		{
 			throw new System.NotSupportedException("References to collections must be define a SQL alias");
 		}
@@ -117,4 +117,4 @@ public IType Type
 			get { return memberPersister.CollectionType; }
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Persister/Collection/ElementPropertyMapping.cs b/src/NHibernate/Persister/Collection/ElementPropertyMapping.cs
@@ -47,7 +47,7 @@ public bool TryToType(string propertyName, out IType outType)
 			}
 		}
 
-		public string[] ToColumns(string alias, string propertyName)
+		public string[] ToColumns(string alias, string propertyName, bool useLastIndex)
 		{
 			if (propertyName == null || "id".Equals(propertyName))
 			{
@@ -59,7 +59,7 @@ public string[] ToColumns(string alias, string propertyName)
 			}
 		}
 
-		public string[] ToColumns(string propertyName)
+		public string[] ToColumns(string propertyName, bool useLastIndex)
 		{
 			throw new System.NotSupportedException("References to collections must be define a SQL alias");
 		}
@@ -71,4 +71,4 @@ public IType Type
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -1118,9 +1118,9 @@ protected virtual bool IsIdOfTable(int property, int table)
 			return false;
 		}
 
-		protected abstract int GetSubclassPropertyTableNumber(int i);
+		protected abstract int GetSubclassPropertyTableNumber(int i, bool useLastIndex);
 
-		internal int GetSubclassPropertyTableNumber(string propertyName, string entityName)
+		internal int GetSubclassPropertyTableNumber(string propertyName, string entityName, bool useLastIndex = false)
 		{
 			var type = propertyMapping.ToType(propertyName);
 			if (type.IsAssociationType && ((IAssociationType) type).UseLHSPrimaryKey)
@@ -1271,7 +1271,7 @@ protected internal virtual SqlString GenerateLazySelectString()
 				// use the subclass closure
 				int propertyNumber = GetSubclassPropertyIndex(lazyPropertyNames[i]);
 
-				int tableNumber = GetSubclassPropertyTableNumber(propertyNumber);
+				int tableNumber = GetSubclassPropertyTableNumber(propertyNumber, false);
 				tableNumbers.Add(tableNumber);
 
 				int[] colNumbers = subclassPropertyColumnNumberClosure[propertyNumber];
@@ -1326,7 +1326,7 @@ protected virtual IDictionary<string, SqlString> GenerateLazySelectStringsByFetc
 					// use the subclass closure
 					var propertyNumber = GetSubclassPropertyIndex(lazyPropertyDescriptor.Name);
 
-					var tableNumber = GetSubclassPropertyTableNumber(propertyNumber);
+					var tableNumber = GetSubclassPropertyTableNumber(propertyNumber, false);
 					tableNumbers.Add(tableNumber);
 
 					var colNumbers = subclassPropertyColumnNumberClosure[propertyNumber];
@@ -2050,12 +2050,12 @@ public virtual string GetRootTableAlias(string drivingAlias)
 			return drivingAlias;
 		}
 
-		public virtual string[] ToColumns(string alias, string propertyName)
+		public virtual string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)
 		{
-			return propertyMapping.ToColumns(alias, propertyName);
+			return propertyMapping.ToColumns(alias, propertyName, useLastIndex);
 		}
 
-		public string[] ToColumns(string propertyName)
+		public string[] ToColumns(string propertyName, bool useLastIndex = false)
 		{
 			return propertyMapping.GetColumnNames(propertyName);
 		}
@@ -2083,7 +2083,7 @@ public string[] GetPropertyColumnNames(string propertyName)
 		/// SingleTableEntityPersister defines an overloaded form
 		/// which takes the entity name.
 		/// </remarks>
-		public virtual int GetSubclassPropertyTableNumber(string propertyPath)
+		public virtual int GetSubclassPropertyTableNumber(string propertyPath, bool useLastIndex)
 		{
 			string rootPropertyName = StringHelper.Root(propertyPath);
 			IType type = propertyMapping.ToType(rootPropertyName);
@@ -2110,13 +2110,16 @@ public virtual int GetSubclassPropertyTableNumber(string propertyPath)
 					return getSubclassColumnTableNumberClosure()[idx];
 				}
 			}*/
-			int index = Array.LastIndexOf(SubclassPropertyNameClosure, rootPropertyName); //TODO: optimize this better!
-			return index == -1 ? 0 : GetSubclassPropertyTableNumber(index);
+			int index = useLastIndex
+				? Array.LastIndexOf(SubclassPropertyNameClosure, rootPropertyName)
+				: Array.IndexOf(SubclassPropertyNameClosure, rootPropertyName); //TODO: optimize this better!
+
+			return index == -1 ? 0 : GetSubclassPropertyTableNumber(index, false);
 		}
 
 		public virtual Declarer GetSubclassPropertyDeclarer(string propertyPath)
 		{
-			int tableIndex = GetSubclassPropertyTableNumber(propertyPath);
+			int tableIndex = GetSubclassPropertyTableNumber(propertyPath, false);
 			if (tableIndex == 0)
 			{
 				return Declarer.Class;
@@ -2164,7 +2167,7 @@ private string GetSubclassAliasedColumn(string rootAlias, int tableNumber, strin
 
 		public string[] ToColumns(string name, int i)
 		{
-			string alias = GenerateTableAlias(name, GetSubclassPropertyTableNumber(i));
+			string alias = GenerateTableAlias(name, GetSubclassPropertyTableNumber(i, false));
 			string[] cols = GetSubclassPropertyColumnNames(i);
 			string[] templates = SubclassPropertyFormulaTemplateClosure[i];
 			string[] result = new string[cols.Length];
@@ -2398,7 +2401,7 @@ private EntityLoader GetAppropriateUniqueKeyLoader(string propertyName, IDiction
 				return uniqueKeyLoaders[propertyName];
 			}
 
-			return CreateUniqueKeyLoader(propertyMapping.ToType(propertyName), propertyMapping.ToColumns(propertyName), enabledFilters);
+			return CreateUniqueKeyLoader(propertyMapping.ToType(propertyName), propertyMapping.ToColumns(propertyName, false), enabledFilters);
 		}
 
 		public int GetPropertyIndex(string propertyName)
@@ -3682,7 +3685,7 @@ private IDictionary<string, string> GetColumnsToTableAliasMap(string rootAlias)
 
 				if (cols != null && cols.Length > 0)
 				{
-					PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i));
+					PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i, false));
 					propDictionary[key] = property;
 				}
 			}
diff --git a/src/NHibernate/Persister/Entity/AbstractPropertyMapping.cs b/src/NHibernate/Persister/Entity/AbstractPropertyMapping.cs
@@ -44,7 +44,7 @@ public bool TryToType(string propertyName, out IType type)
 			return typesByPropertyPath.TryGetValue(propertyName, out type);
 		}
 
-		public virtual string[] ToColumns(string alias, string propertyName)
+		public virtual string[] ToColumns(string alias, string propertyName, bool useLastIndex)
 		{
 			//TODO: *two* hashmap lookups here is one too many...
 			string[] columns = GetColumns(propertyName);
@@ -71,7 +71,7 @@ private string[] GetColumns(string propertyName)
 			return columns;
 		}
 
-		public virtual string[] ToColumns(string propertyName)
+		public virtual string[] ToColumns(string propertyName, bool useLastIndex)
 		{
 			string[] columns = GetColumns(propertyName);
 
diff --git a/src/NHibernate/Persister/Entity/BasicEntityPropertyMapping.cs b/src/NHibernate/Persister/Entity/BasicEntityPropertyMapping.cs
@@ -26,11 +26,10 @@ public override IType Type
 			get { return persister.Type; }
 		}
 
-		public override string[] ToColumns(string alias, string propertyName)
+		public override string[] ToColumns(string alias, string propertyName, bool useLastIndex)
 		{
-			return
-				base.ToColumns(persister.GenerateTableAlias(alias, persister.GetSubclassPropertyTableNumber(propertyName)),
-				               propertyName);
+			var tableAlias = persister.GenerateTableAlias(alias, persister.GetSubclassPropertyTableNumber(propertyName, useLastIndex));
+			return base.ToColumns(tableAlias, propertyName, useLastIndex);
 		}
 	}
 }
diff --git a/src/NHibernate/Persister/Entity/IPropertyMapping.cs b/src/NHibernate/Persister/Entity/IPropertyMapping.cs
@@ -34,10 +34,11 @@ public interface IPropertyMapping
 		/// </summary>
 		/// <param name="alias"></param>
 		/// <param name="propertyName"></param>
+		/// <param name="useLastIndex"></param>
 		/// <returns></returns>
-		string[] ToColumns(string alias, string propertyName);
+		string[] ToColumns(string alias, string propertyName, bool useLastIndex = false);
 
 		/// <summary> Given a property path, return the corresponding column name(s).</summary>
-		string[] ToColumns(string propertyName);
+		string[] ToColumns(string propertyName, bool useLastIndex = false);
 	}
-}
+}
diff --git a/src/NHibernate/Persister/Entity/IQueryable.cs b/src/NHibernate/Persister/Entity/IQueryable.cs
@@ -112,13 +112,14 @@ public interface IQueryable : ILoadable, IPropertyMapping, IJoinable
 		/// to which this property is mapped.
 		/// </summary>
 		/// <param name="propertyPath">The name of the property. </param>
+		/// <param name="useLastIndex">The name of the property. </param>
 		/// <returns> The number of the table to which the property is mapped. </returns>
 		/// <remarks>
 		/// Note that this is <b>not</b> relative to the results from {@link #getConstraintOrderedTableNameClosure()}.
 		/// It is relative to the subclass table name closure maintained internal to the persister (yick!).
 		/// It is also relative to the indexing used to resolve {@link #getSubclassTableName}...
 		/// </remarks>
-		int GetSubclassPropertyTableNumber(string propertyPath);
+		int GetSubclassPropertyTableNumber(string propertyPath, bool useLastIndex);
 
 		/// <summary> Determine whether the given property is declared by our
 		/// mapped class, our super class, or one of our subclasses...
diff --git a/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs b/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs
@@ -526,7 +526,7 @@ public override string GenerateFilterConditionAlias(string rootAlias)
 			return GenerateTableAlias(rootAlias, tableSpan - 1);
 		}
 
-		public override string[] ToColumns(string alias, string propertyName)
+		public override string[] ToColumns(string alias, string propertyName, bool useLastIndex)
 		{
 			if (EntityClass.Equals(propertyName))
 			{
@@ -542,11 +542,11 @@ public override string[] ToColumns(string alias, string propertyName)
 			}
 			else
 			{
-				return base.ToColumns(alias, propertyName);
+				return base.ToColumns(alias, propertyName, useLastIndex);
 			}
 		}
 
-		protected override int GetSubclassPropertyTableNumber(int i)
+		protected override int GetSubclassPropertyTableNumber(int i, bool useLastIndex)
 		{
 			return subclassPropertyTableNumberClosure[i];
 		}
diff --git a/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs b/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
@@ -675,7 +675,7 @@ protected override void AddDiscriminatorToSelect(SelectFragment select, string n
 				select.AddColumn(name, DiscriminatorColumnName, DiscriminatorAlias);
 		}
 
-		protected override int GetSubclassPropertyTableNumber(int i)
+		protected override int GetSubclassPropertyTableNumber(int i, bool useLastIndex)
 		{
 			return subclassPropertyTableNumberClosure[i];
 		}
@@ -696,12 +696,12 @@ protected override void AddDiscriminatorToInsert(SqlInsertBuilder insert)
 		protected override bool IsSubclassPropertyDeferred(string propertyName, string entityName)
 		{
 			return
-				hasSequentialSelects && IsSubclassTableSequentialSelect(base.GetSubclassPropertyTableNumber(propertyName, entityName));
+				hasSequentialSelects && IsSubclassTableSequentialSelect(base.GetSubclassPropertyTableNumber(propertyName, entityName, false));
 		}
 
 		protected override bool IsPropertyDeferred(int propertyIndex)
 		{
-			return _hasSequentialSelect && subclassTableSequentialSelect[GetSubclassPropertyTableNumber(propertyIndex)];
+			return _hasSequentialSelect && subclassTableSequentialSelect[GetSubclassPropertyTableNumber(propertyIndex, false)];
 		}
 
 		//Since v5.3
@@ -713,9 +713,9 @@ public override bool HasSequentialSelect
 
 		//Since v5.3
 		[Obsolete("This method has no more usage in NHibernate and will be removed in a future version.")]
-		public new int GetSubclassPropertyTableNumber(string propertyName, string entityName)
+		public new int GetSubclassPropertyTableNumber(string propertyName, string entityName, bool useLastIndex = false)
 		{
-			return base.GetSubclassPropertyTableNumber(propertyName, entityName);
+			return base.GetSubclassPropertyTableNumber(propertyName, entityName, useLastIndex);
 		}
 
 		//Since v5.3
diff --git a/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs b/src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public AssignmentSpecification(IASTNode eq, IQueryable persister)`
`61`	`61`	`}`
`62`	`62`	`else`
`63`	`63`	`{`
`64`		`- temp.Add(persister.GetSubclassTableName(persister.GetSubclassPropertyTableNumber(propertyPath)));`
	`64`	`+ temp.Add(persister.GetSubclassTableName(persister.GetSubclassPropertyTableNumber(propertyPath, false)));`
`65`	`65`	`}`
`66`	`66`	`_tableNames = new HashSet<string>(temp);`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -150,14 +150,14 @@ public bool TryToType(string propertyName, out IType type)`
`150`	`150`	`return fromElementType.GetBasePropertyMapping().TryToType(GetPropertyPath(propertyName), out type);`
`151`	`151`	`}`
`152`	`152`
`153`		`- public string[] ToColumns(string alias, string propertyName)`
	`153`	`+ public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)`
`154`	`154`	`{`
`155`		`- return fromElementType.GetBasePropertyMapping().ToColumns(alias, GetPropertyPath(propertyName));`
	`155`	`+ return fromElementType.GetBasePropertyMapping().ToColumns(alias, GetPropertyPath(propertyName), useLastIndex);`
`156`	`156`	`}`
`157`	`157`
`158`		`- public string[] ToColumns(string propertyName)`
	`158`	`+ public string[] ToColumns(string propertyName, bool useLastIndex = false)`
`159`	`159`	`{`
`160`		`- return fromElementType.GetBasePropertyMapping().ToColumns(GetPropertyPath(propertyName));`
	`160`	`+ return fromElementType.GetBasePropertyMapping().ToColumns(GetPropertyPath(propertyName), useLastIndex);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private bool IsSuperclassProperty(string propertyName)`
`214`	`214`	`//`
`215`	`215`	`// we may want to disallow it for discrim-subclass just for`
`216`	`216`	`// consistency-sake (currently does not work anyway)...`
`217`		`- return _persister.GetSubclassPropertyTableNumber(propertyName) != 0;`
	`217`	`+ return _persister.GetSubclassPropertyTableNumber(propertyName, false) != 0;`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`/// <summary>`
`@@ -263,4 +263,4 @@ private static bool AreSqlTypesCompatible(SqlType target, SqlType source)`
`263`	`263`	`return target.Equals(source);`
`264`	`264`	`}`
`265`	`265`	`}`
`266`		`-}`
	`266`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1386,7 +1386,7 @@ public bool IsManyToManyFiltered(IDictionary<string, IFilter> enabledFilters)`
`1386`	`1386`	`return IsManyToMany && (manyToManyWhereString != null \|\| manyToManyFilterHelper.IsAffectedBy(enabledFilters));`
`1387`	`1387`	`}`
`1388`	`1388`
`1389`		`- public string[] ToColumns(string alias, string propertyName)`
	`1389`	`+ public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)`
`1390`	`1390`	`{`
`1391`	`1391`	`if ("index".Equals(propertyName))`
`1392`	`1392`	`{`
`@@ -1397,10 +1397,10 @@ public string[] ToColumns(string alias, string propertyName)`
`1397`	`1397`
`1398`	`1398`	`return StringHelper.Qualify(alias, indexColumnNames);`
`1399`	`1399`	`}`
`1400`		`- return elementPropertyMapping.ToColumns(alias, propertyName);`
	`1400`	`+ return elementPropertyMapping.ToColumns(alias, propertyName, useLastIndex);`
`1401`	`1401`	`}`
`1402`	`1402`
`1403`		`- public string[] ToColumns(string propertyName)`
	`1403`	`+ public string[] ToColumns(string propertyName, bool useLastIndex = false)`
`1404`	`1404`	`{`
`1405`	`1405`	`if ("index".Equals(propertyName))`
`1406`	`1406`	`{`
`@@ -1412,7 +1412,7 @@ public string[] ToColumns(string propertyName)`
`1412`	`1412`	`return indexColumnNames;`
`1413`	`1413`	`}`
`1414`	`1414`
`1415`		`- return elementPropertyMapping.ToColumns(propertyName);`
	`1415`	`+ return elementPropertyMapping.ToColumns(propertyName, useLastIndex);`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`	`1418`	`protected abstract SqlCommandInfo GenerateDeleteString();`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public bool TryToType(string propertyName, out IType type)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- public string[] ToColumns(string alias, string propertyName)`
	`60`	`+ public string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)`
`61`	`61`	`{`
`62`	`62`	`string[] cols;`
`63`	`63`	`switch (propertyName)`
`@@ -107,7 +107,7 @@ public string[] ToColumns(string alias, string propertyName)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- public string[] ToColumns(string propertyName)`
	`110`	`+ public string[] ToColumns(string propertyName, bool useLastIndex = false)`
`111`	`111`	`{`
`112`	`112`	`throw new System.NotSupportedException("References to collections must be define a SQL alias");`
`113`	`113`	`}`
`@@ -117,4 +117,4 @@ public IType Type`
`117`	`117`	`get { return memberPersister.CollectionType; }`
`118`	`118`	`}`
`119`	`119`	`}`
`120`		`-}`
	`120`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public bool TryToType(string propertyName, out IType outType)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- public string[] ToColumns(string alias, string propertyName)`
	`50`	`+ public string[] ToColumns(string alias, string propertyName, bool useLastIndex)`
`51`	`51`	`{`
`52`	`52`	`if (propertyName == null \|\| "id".Equals(propertyName))`
`53`	`53`	`{`
`@@ -59,7 +59,7 @@ public string[] ToColumns(string alias, string propertyName)`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public string[] ToColumns(string propertyName)`
	`62`	`+ public string[] ToColumns(string propertyName, bool useLastIndex)`
`63`	`63`	`{`
`64`	`64`	`throw new System.NotSupportedException("References to collections must be define a SQL alias");`
`65`	`65`	`}`
`@@ -71,4 +71,4 @@ public IType Type`
`71`	`71`
`72`	`72`	`#endregion`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1118,9 +1118,9 @@ protected virtual bool IsIdOfTable(int property, int table)`
`1118`	`1118`	`return false;`
`1119`	`1119`	`}`
`1120`	`1120`
`1121`		`- protected abstract int GetSubclassPropertyTableNumber(int i);`
	`1121`	`+ protected abstract int GetSubclassPropertyTableNumber(int i, bool useLastIndex);`
`1122`	`1122`
`1123`		`- internal int GetSubclassPropertyTableNumber(string propertyName, string entityName)`
	`1123`	`+ internal int GetSubclassPropertyTableNumber(string propertyName, string entityName, bool useLastIndex = false)`
`1124`	`1124`	`{`
`1125`	`1125`	`var type = propertyMapping.ToType(propertyName);`
`1126`	`1126`	`if (type.IsAssociationType && ((IAssociationType) type).UseLHSPrimaryKey)`
`@@ -1271,7 +1271,7 @@ protected internal virtual SqlString GenerateLazySelectString()`
`1271`	`1271`	`// use the subclass closure`
`1272`	`1272`	`int propertyNumber = GetSubclassPropertyIndex(lazyPropertyNames[i]);`
`1273`	`1273`
`1274`		`- int tableNumber = GetSubclassPropertyTableNumber(propertyNumber);`
	`1274`	`+ int tableNumber = GetSubclassPropertyTableNumber(propertyNumber, false);`
`1275`	`1275`	`tableNumbers.Add(tableNumber);`
`1276`	`1276`
`1277`	`1277`	`int[] colNumbers = subclassPropertyColumnNumberClosure[propertyNumber];`
`@@ -1326,7 +1326,7 @@ protected virtual IDictionary<string, SqlString> GenerateLazySelectStringsByFetc`
`1326`	`1326`	`// use the subclass closure`
`1327`	`1327`	`var propertyNumber = GetSubclassPropertyIndex(lazyPropertyDescriptor.Name);`
`1328`	`1328`
`1329`		`- var tableNumber = GetSubclassPropertyTableNumber(propertyNumber);`
	`1329`	`+ var tableNumber = GetSubclassPropertyTableNumber(propertyNumber, false);`
`1330`	`1330`	`tableNumbers.Add(tableNumber);`
`1331`	`1331`
`1332`	`1332`	`var colNumbers = subclassPropertyColumnNumberClosure[propertyNumber];`
`@@ -2050,12 +2050,12 @@ public virtual string GetRootTableAlias(string drivingAlias)`
`2050`	`2050`	`return drivingAlias;`
`2051`	`2051`	`}`
`2052`	`2052`
`2053`		`- public virtual string[] ToColumns(string alias, string propertyName)`
	`2053`	`+ public virtual string[] ToColumns(string alias, string propertyName, bool useLastIndex = false)`
`2054`	`2054`	`{`
`2055`		`- return propertyMapping.ToColumns(alias, propertyName);`
	`2055`	`+ return propertyMapping.ToColumns(alias, propertyName, useLastIndex);`
`2056`	`2056`	`}`
`2057`	`2057`
`2058`		`- public string[] ToColumns(string propertyName)`
	`2058`	`+ public string[] ToColumns(string propertyName, bool useLastIndex = false)`
`2059`	`2059`	`{`
`2060`	`2060`	`return propertyMapping.GetColumnNames(propertyName);`
`2061`	`2061`	`}`
`@@ -2083,7 +2083,7 @@ public string[] GetPropertyColumnNames(string propertyName)`
`2083`	`2083`	`/// SingleTableEntityPersister defines an overloaded form`
`2084`	`2084`	`/// which takes the entity name.`
`2085`	`2085`	`/// </remarks>`
`2086`		`- public virtual int GetSubclassPropertyTableNumber(string propertyPath)`
	`2086`	`+ public virtual int GetSubclassPropertyTableNumber(string propertyPath, bool useLastIndex)`
`2087`	`2087`	`{`
`2088`	`2088`	`string rootPropertyName = StringHelper.Root(propertyPath);`
`2089`	`2089`	`IType type = propertyMapping.ToType(rootPropertyName);`
`@@ -2110,13 +2110,16 @@ public virtual int GetSubclassPropertyTableNumber(string propertyPath)`
`2110`	`2110`	`return getSubclassColumnTableNumberClosure()[idx];`
`2111`	`2111`	`}`
`2112`	`2112`	`}*/`
`2113`		`- int index = Array.LastIndexOf(SubclassPropertyNameClosure, rootPropertyName); //TODO: optimize this better!`
`2114`		`- return index == -1 ? 0 : GetSubclassPropertyTableNumber(index);`
	`2113`	`+ int index = useLastIndex`
	`2114`	`+ ? Array.LastIndexOf(SubclassPropertyNameClosure, rootPropertyName)`
	`2115`	`+ : Array.IndexOf(SubclassPropertyNameClosure, rootPropertyName); //TODO: optimize this better!`
	`2116`	`+`
	`2117`	`+ return index == -1 ? 0 : GetSubclassPropertyTableNumber(index, false);`
`2115`	`2118`	`}`
`2116`	`2119`
`2117`	`2120`	`public virtual Declarer GetSubclassPropertyDeclarer(string propertyPath)`
`2118`	`2121`	`{`
`2119`		`- int tableIndex = GetSubclassPropertyTableNumber(propertyPath);`
	`2122`	`+ int tableIndex = GetSubclassPropertyTableNumber(propertyPath, false);`
`2120`	`2123`	`if (tableIndex == 0)`
`2121`	`2124`	`{`
`2122`	`2125`	`return Declarer.Class;`
`@@ -2164,7 +2167,7 @@ private string GetSubclassAliasedColumn(string rootAlias, int tableNumber, strin`
`2164`	`2167`
`2165`	`2168`	`public string[] ToColumns(string name, int i)`
`2166`	`2169`	`{`
`2167`		`- string alias = GenerateTableAlias(name, GetSubclassPropertyTableNumber(i));`
	`2170`	`+ string alias = GenerateTableAlias(name, GetSubclassPropertyTableNumber(i, false));`
`2168`	`2171`	`string[] cols = GetSubclassPropertyColumnNames(i);`
`2169`	`2172`	`string[] templates = SubclassPropertyFormulaTemplateClosure[i];`
`2170`	`2173`	`string[] result = new string[cols.Length];`
`@@ -2398,7 +2401,7 @@ private EntityLoader GetAppropriateUniqueKeyLoader(string propertyName, IDiction`
`2398`	`2401`	`return uniqueKeyLoaders[propertyName];`
`2399`	`2402`	`}`
`2400`	`2403`
`2401`		`- return CreateUniqueKeyLoader(propertyMapping.ToType(propertyName), propertyMapping.ToColumns(propertyName), enabledFilters);`
	`2404`	`+ return CreateUniqueKeyLoader(propertyMapping.ToType(propertyName), propertyMapping.ToColumns(propertyName, false), enabledFilters);`
`2402`	`2405`	`}`
`2403`	`2406`
`2404`	`2407`	`public int GetPropertyIndex(string propertyName)`
`@@ -3682,7 +3685,7 @@ private IDictionary<string, string> GetColumnsToTableAliasMap(string rootAlias)`
`3682`	`3685`
`3683`	`3686`	`if (cols != null && cols.Length > 0)`
`3684`	`3687`	`{`
`3685`		`- PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i));`
	`3688`	`+ PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i, false));`
`3686`	`3689`	`propDictionary[key] = property;`
`3687`	`3690`	`}`
`3688`	`3691`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public bool TryToType(string propertyName, out IType type)`
`44`	`44`	`return typesByPropertyPath.TryGetValue(propertyName, out type);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public virtual string[] ToColumns(string alias, string propertyName)`
	`47`	`+ public virtual string[] ToColumns(string alias, string propertyName, bool useLastIndex)`
`48`	`48`	`{`
`49`	`49`	`//TODO: two hashmap lookups here is one too many...`
`50`	`50`	`string[] columns = GetColumns(propertyName);`
`@@ -71,7 +71,7 @@ private string[] GetColumns(string propertyName)`
`71`	`71`	`return columns;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public virtual string[] ToColumns(string propertyName)`
	`74`	`+ public virtual string[] ToColumns(string propertyName, bool useLastIndex)`
`75`	`75`	`{`
`76`	`76`	`string[] columns = GetColumns(propertyName);`
`77`	`77`