Merge branch 'NH-2167'

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH2167/Entity.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH2167
+{
+	class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

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

@@ -0,0 +1,69 @@
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Criterion;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2167
+{
+	public class Fixture : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally" };
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void GroupPropertyWithSqlFunctionDoesNotThrow()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var projection = session.CreateCriteria<Entity>().SetProjection(
+					Projections.GroupProperty(
+						Projections.SqlFunction(
+							"substring",
+							NHibernateUtil.String,
+							Projections.Property("Name"),
+							Projections.Constant(0),
+							Projections.Constant(1))));
+
+				projection.List();
+			}
+		}
+	}
+}

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.Test/NHibernate.Test.csproj

@@ -721,6 +721,8 @@
     <Compile Include="NHSpecificTest\NH3609\MappingEntity.cs" />
     <Compile Include="NHSpecificTest\NH3609\Entity.cs" />
     <Compile Include="NHSpecificTest\NH3609\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2167\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH2167\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2839\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3564\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3583\Entity.cs" />
@@ -3722,7 +3724,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Cascade\OneToOneCascadeDelete\Pk\Unidirectional\Hbm\" />
-    <Folder Include="NHSpecificTest\NH3615\" />
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>

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