Merge pull request #197 from IDDesigns/NH-3428

Author: hazzik

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

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

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

@@ -0,0 +1,65 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3428
+{
+	using NHibernate.Criterion;
+
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return dialect is Dialect.MsSql2005Dialect;
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction 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 (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void QueryFailsWhenDistinctOrderedResultIsPagedPastPageOne()
+		{
+			using (ISession session = this.OpenSession())
+			using (session.BeginTransaction())
+			{
+				var criteria = session.CreateCriteria<Entity>();
+				var projectionList = Projections.ProjectionList().Add(Projections.Property("Name"), "Name");
+
+				criteria.SetProjection(Projections.Distinct(projectionList));
+
+				criteria.SetFirstResult(1).SetMaxResults(1);
+				criteria.AddOrder(Order.Asc("Name"));
+
+				var result = criteria.List();
+
+				Assert.AreEqual(1, result.Count);
+				Assert.AreEqual("Sally", result[0]);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3428/Mappings.hbm.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH3428">
+
+	<class name="Entity">
+		<id name="Id" generator="guid.comb" />
+		<property name="Name" />
+	</class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -668,6 +668,8 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Domain.cs" />
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
+    <Compile Include="NHSpecificTest\NH3428\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3428\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3408\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3408\Model.cs" />
     <Compile Include="NHSpecificTest\NH2297\CustomCompositeUserType.cs" />
@@ -2883,6 +2885,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH3428\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsNames.hbm.xml" />

src/NHibernate/Dialect/MsSql2005DialectQueryPager.cs

@@ -201,6 +201,11 @@ private static void AppendSortExpressionsForDistinct(Dictionary<SqlString, SqlSt
 					result.Add("q_.");
 					result.Add(columnToAlias[sortExpression]);
 				}
+				else if (columnToAlias.ContainsValue(sortExpression)) // When a distinct query is paged the sortexpressions could already be aliased.
+				{
+					result.Add("q_.");
+					result.Add(sortExpression);
+				}
 				else
 				{
 					throw new HibernateException(