NH-3644: Remove older overloads of GetColumnAliases() which are now unused from IProjection. These older versions had some issues with projections that resulted in several columns (components and composite keys).

Author: oskarb

releasenotes.txt

@@ -4,6 +4,7 @@ Build 4.0.0.XXXX
 ** Known BREAKING CHANGES from NH4.0.0.Alpha2 to 4.0.0.Alpha1
 
     The interface IEnhancedProjection was removed and its methods moved to IProjection.
+    Two other overloads of the GetColumnAliases() methods was removed from IProjection.
 
 Build 4.0.0.Alpha2
 =============================

src/NHibernate.Test/Criteria/AddNumberProjection.cs

@@ -36,7 +36,7 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 				.Add(" + ")
 				.Add(criteriaQuery.NewQueryParameter(typedValue).Single())
 				.Add(") as ")
-				.Add(GetColumnAliases(0)[0])
+				.Add(GetColumnAliases(0, criteria, criteriaQuery)[0])
 				.ToSqlString();
 		}
 

src/NHibernate/Criterion/AliasedProjection.cs

@@ -41,18 +41,6 @@ public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery
 				: null;
 		}
 
-		public virtual string[] GetColumnAliases(int loc)
-		{
-			return projection.GetColumnAliases(loc);
-		}
-
-		public virtual string[] GetColumnAliases(string alias, int loc)
-		{
-			return this.alias.Equals(alias)
-				? GetColumnAliases(loc)
-				: null;
-		}
-		
 		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			return projection.GetColumnAliases(position, criteria, criteriaQuery);

src/NHibernate/Criterion/AvgProjection.cs

@@ -31,7 +31,7 @@ public override SqlString ToSqlString(ICriteria criteria, int loc, ICriteriaQuer
 				parameter = criteriaQuery.GetColumn(criteria, propertyName);
 			}
 			string expression = string.Format("{0}(cast({1} as {2})) as {3}", aggregate, parameter, sqlType,
-			                                  GetColumnAliases(loc)[0]);
+			                                  GetColumnAliases(loc, criteria, criteriaQuery)[0]);
 			return new SqlString(expression);
 		}
 

src/NHibernate/Criterion/CastProjection.cs

@@ -42,7 +42,7 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 			SqlString val = projection.ToSqlString(criteria, loc, criteriaQuery,enabledFilters);
 			val = SqlStringHelper.RemoveAsAliasesFromSql(val);
 
-			return new SqlString("cast( ", val, " as ", sqlType, ") as ", GetColumnAliases(position)[0]);
+			return new SqlString("cast( ", val, " as ", sqlType, ") as ", GetColumnAliases(position, criteria, criteriaQuery)[0]);
 		}
 
 		public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)

src/NHibernate/Criterion/ConditionalProjection.cs

@@ -49,7 +49,8 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 			ifTrue = SqlStringHelper.RemoveAsAliasesFromSql(ifTrue);
 			SqlString ifFalse = whenFalse.ToSqlString(criteria, position + GetHashCode() + 2, criteriaQuery, enabledFilters);
 			ifFalse = SqlStringHelper.RemoveAsAliasesFromSql(ifFalse);
-			return new SqlString("(case when ", condition, " then ", ifTrue, " else ", ifFalse, " end) as ", GetColumnAliases(position)[0]);
+			return new SqlString("(case when ", condition, " then ", ifTrue, " else ", ifFalse, " end) as ",
+			                     GetColumnAliases(position, criteria, criteriaQuery)[0]);
 		}
 
 		public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)

src/NHibernate/Criterion/ConstantProjection.cs

@@ -46,7 +46,7 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 			return new SqlString(
 				criteriaQuery.NewQueryParameter(typedValue).Single(),
 				" as ",
-				GetColumnAliases(position)[0]);
+				GetColumnAliases(position, criteria, criteriaQuery)[0]);
 		}
 
 		public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)

src/NHibernate/Criterion/Distinct.cs

@@ -37,21 +37,11 @@ public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery
 			return projection.GetTypes(alias, criteria, criteriaQuery);
 		}
 
-		public virtual string[] GetColumnAliases(int loc)
-		{
-			return projection.GetColumnAliases(loc);
-		}
-		
 		public virtual string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			return projection.GetColumnAliases(position, criteria, criteriaQuery);
 		}
 
-		public virtual string[] GetColumnAliases(string alias, int loc)
-		{
-			return projection.GetColumnAliases(alias, loc);
-		}
-		
 		public virtual string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			return projection.GetColumnAliases(alias, position, criteria, criteriaQuery);

src/NHibernate/Criterion/GroupedProjection.cs

@@ -38,16 +38,6 @@ public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery
 			return this.projection.GetTypes(alias,criteria,criteriaQuery);
 		}
 
-		public virtual string[] GetColumnAliases(int loc)
-		{
-			return projection.GetColumnAliases(loc);
-		}
-
-		public virtual string[] GetColumnAliases(string alias, int loc)
-		{
-			return null;
-		}
-
 		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			return projection.GetColumnAliases(position, criteria, criteriaQuery);

src/NHibernate/Criterion/IProjection.cs

@@ -49,21 +49,6 @@ SqlString ToGroupSqlString(ICriteria criteria,
 		/// <returns></returns>
 		IType[] GetTypes(string alias, ICriteria criteria, ICriteriaQuery criteriaQuery);
 
-		/// <summary>
-		/// Get the SQL select clause column aliases for a particular user-visible alias
-		/// </summary>
-		/// <param name="loc"></param>
-		/// <returns></returns>
-		string[] GetColumnAliases(int loc);
-
-		/// <summary>
-		/// Get the SQL select clause column aliases for a particular user-visible alias
-		/// </summary>
-		/// <param name="alias"></param>
-		/// <param name="loc"></param>
-		/// <returns></returns>
-		string[] GetColumnAliases(string alias, int loc);
-
 		/// <summary>
 		/// Get the user-visible aliases for this projection (ie. the ones that will be passed to the ResultTransformer)
 		/// </summary>

src/NHibernate/Criterion/ProjectionList.cs

@@ -89,33 +89,6 @@ public SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQue
 			return buf.ToSqlString();
 		}
 
-		public string[] GetColumnAliases(int loc)
-		{
-			IList<string> aliases = new List<string>(Length);
-
-			for (int i = 0; i < Length; i++)
-			{
-				String[] colAliases = this[i].GetColumnAliases(loc);
-				foreach (string alias in colAliases)
-					aliases.Add(alias);
-				loc += colAliases.Length;
-			}
-			string[] result = new string[aliases.Count];
-			aliases.CopyTo(result, 0);
-			return result;
-		}
-
-		public string[] GetColumnAliases(string alias, int loc)
-		{
-			for (int i = 0; i < Length; i++)
-			{
-				String[] result = this[i].GetColumnAliases(alias, loc);
-				if (result != null) return result;
-				loc += this[i].GetColumnAliases(loc).Length;
-			}
-			return null;
-		}
-		
 		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
 			var result = new List<string>(Length);

src/NHibernate/Criterion/SqlFunctionProjection.cs

@@ -84,7 +84,7 @@ public override SqlString ToSqlString(ICriteria criteria, int position, ICriteri
 			return new SqlString(
 				sqlFunction.Render(arguments, criteriaQuery.Factory),
 				" as ",
-				GetColumnAliases(position)[0]);
+				GetColumnAliases(position, criteria, criteriaQuery)[0]);
 		}
 
 		private ISQLFunction GetFunction(ICriteriaQuery criteriaQuery)