NH-2167 - Fix Projections.GroupProperty with parameters inside

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3609/Fixture.cs

@@ -79,7 +79,7 @@ public void CountWithConditionalDoesNotThrow()
 			}
 		}
 
-		[Test, Ignore("Not fixed yet")]
+		[Test]
 		public void GroupByClauseHasParameterSet()
 		{
 			using (var session = OpenSession())

src/NHibernate/Criterion/GroupedProjection.cs

@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
-using NHibernate.Util;
 
 namespace NHibernate.Criterion
 {
 	[Serializable]
-	public class GroupedProjection:IProjection
+	public class GroupedProjection : IProjection
 	{
 		private readonly IProjection projection;
+		private SqlString renderedProjection;
 
 		public GroupedProjection(IProjection projection)
 		{
@@ -20,12 +19,13 @@ public GroupedProjection(IProjection projection)
 
 		public virtual SqlString ToSqlString(ICriteria criteria, int position, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
 		{
-			return projection.ToSqlString(criteria, position, criteriaQuery, enabledFilters);
+			return renderedProjection = projection.ToSqlString(criteria, position, criteriaQuery, enabledFilters);
 		}
 
 		public virtual SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery criteriaQuery, IDictionary<string, IFilter> enabledFilters)
 		{
-			return SqlStringHelper.RemoveAsAliasesFromSql(this.projection.ToSqlString(criteria, 0, criteriaQuery, enabledFilters));
+			//This is kind of a hack. The hack is based on the fact that ToGroupSqlString always called after ToSqlString.
+			return SqlStringHelper.RemoveAsAliasesFromSql(renderedProjection);
 		}
 
 		public virtual IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery)
@@ -35,7 +35,7 @@ public virtual IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuery
 
 		public virtual IType[] GetTypes(String alias, ICriteria criteria, ICriteriaQuery criteriaQuery)
 		{
-			return this.projection.GetTypes(alias,criteria,criteriaQuery);
+			return this.projection.GetTypes(alias, criteria, criteriaQuery);
 		}
 
 		public string[] GetColumnAliases(int position, ICriteria criteria, ICriteriaQuery criteriaQuery)
@@ -50,7 +50,7 @@ public string[] GetColumnAliases(string alias, int position, ICriteria criteria,
 
 		public virtual string[] Aliases
 		{
-			get { return new string[] { }; }
+			get { return new string[] {}; }
 		}
 
 		public virtual bool IsGrouped