NH-3644: Move methods from IEnhancedProjection into IProjection.

Author: oskarb

releasenotes.txt

@@ -1,3 +1,10 @@
+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.
+
 Build 4.0.0.Alpha2
 =============================
 

src/NHibernate/Criterion/GroupedProjection.cs

@@ -48,6 +48,18 @@ public virtual string[] GetColumnAliases(string alias, int loc)
 			return null;
 		}
 
+		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
+		{
+			return projection is IEnhancedProjection
+				? ((IEnhancedProjection)projection).GetColumnAliases(position, criteria, criteriaQuery)
+				: this.GetColumnAliases(position);
+		}
+
+		public string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
+		{
+			return null;
+		}
+
 		public virtual string[] Aliases
 		{
 			get { return new string[] { }; }

src/NHibernate/Criterion/IEnhancedProjection.cs

@@ -7,27 +7,5 @@ namespace NHibernate.Criterion
 	/// </summary>
 	public interface IEnhancedProjection : IProjection 
 	{
-		/// <summary>
-		/// Get the SQL column aliases used by this projection for the columns it writes for inclusion into the
-		/// <code>SELECT</code> clause <see cref="IProjection.ToSqlString" />.  NHibernate always uses column aliases 
-		/// to extract data from the <see cref="System.Data.IDataReader" />, so it is important that these be implemented 
-		/// correctly in order for NHibernate to be able to extract these values correctly.
-		/// </summary>
-		/// <param name="position">Just as in <see cref="IProjection.ToSqlString" />, represents the number of columns rendered prior to this projection.</param>
-		/// <param name="criteria">The local criteria to which this project is attached (for resolution).</param>
-		/// <param name="criteriaQuery">The overall criteria query instance.</param>
-		/// <returns>The columns aliases.</returns>
-		string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery);
-		
-		/// <summary>
-		/// Get the SQL column aliases used by this projection for the columns it writes for inclusion into the
-	 	/// <code>SELECT</code> clause (<see cref="IProjection.ToSqlString" />) for a particular criteria-level alias.
-		/// </summary>
-		/// <param name="alias">The criteria-level alias.</param>
-		/// <param name="position">Just as in <see cref="IProjection.ToSqlString" />, represents the number of columns rendered prior to this projection.</param>
-		/// <param name="criteria">The local criteria to which this project is attached (for resolution).</param>
-		/// <param name="criteriaQuery">The overall criteria query instance.</param>
-		/// <returns>The columns aliases.</returns>
-		string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery);
 	}
 }

src/NHibernate/Criterion/IProjection.cs

@@ -86,5 +86,28 @@ SqlString ToGroupSqlString(ICriteria criteria,
 		/// <param name="criteriaQuery">The criteria query.</param>
 		/// <returns></returns>
 		TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery criteriaQuery);
+
+		/// <summary>
+		/// Get the SQL column aliases used by this projection for the columns it writes for inclusion into the
+		/// <code>SELECT</code> clause <see cref="IProjection.ToSqlString" />.  NHibernate always uses column aliases 
+		/// to extract data from the <see cref="System.Data.IDataReader" />, so it is important that these be implemented 
+		/// correctly in order for NHibernate to be able to extract these values correctly.
+		/// </summary>
+		/// <param name="position">Just as in <see cref="IProjection.ToSqlString" />, represents the number of columns rendered prior to this projection.</param>
+		/// <param name="criteria">The local criteria to which this project is attached (for resolution).</param>
+		/// <param name="criteriaQuery">The overall criteria query instance.</param>
+		/// <returns>The columns aliases.</returns>
+		string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery);
+
+		/// <summary>
+		/// Get the SQL column aliases used by this projection for the columns it writes for inclusion into the
+		/// <code>SELECT</code> clause (<see cref="IProjection.ToSqlString" />) for a particular criteria-level alias.
+		/// </summary>
+		/// <param name="alias">The criteria-level alias.</param>
+		/// <param name="position">Just as in <see cref="IProjection.ToSqlString" />, represents the number of columns rendered prior to this projection.</param>
+		/// <param name="criteria">The local criteria to which this project is attached (for resolution).</param>
+		/// <param name="criteriaQuery">The overall criteria query instance.</param>
+		/// <returns>The columns aliases.</returns>
+		string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery);
 	}
 }

src/NHibernate/Criterion/SQLProjection.cs

@@ -64,11 +64,6 @@ public string[] Aliases
 			get { return aliases; }
 		}
 
-		public string[] GetColumnAliases(int loc)
-		{
-			return columnAliases;
-		}
-
 		public bool IsGrouped
 		{
 			get { return grouped; }
@@ -95,9 +90,24 @@ public IType[] GetTypes(string alias, ICriteria crit, ICriteriaQuery criteriaQue
 			return null; //unsupported
 		}
 
+		public string[] GetColumnAliases(int loc)
+		{
+			return columnAliases;
+		}
+
 		public string[] GetColumnAliases(String alias, int loc)
 		{
 			return null; //unsupported
 		}
+
+		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
+		{
+			return columnAliases;
+		}
+
+		public string[] GetColumnAliases(string alias, int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
+		{
+			return null; //unsupported
+		}
 	}
 }