From 80d6fde3bd65be6b976c46378ed284cd2c3c1fc7 Mon Sep 17 00:00:00 2001
From: Gerke Geurts <ggeurts@geurtsrus.com>
Date: Mon, 30 Jul 2018 13:30:36 +0200
Subject: [PATCH] Fixed issue in ordering by entity id in sharded HQL queries

---
 .../ShardedIntegrationTests.cs                | 21 +++++++++++++++++++
 .../NHibernate.Shards.csproj                  |  2 +-
 .../Query/ShardedQueryExpression.cs           |  4 +++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/NHibernate.Shards.Test/ShardedIntegrationTests.cs b/src/NHibernate.Shards.Test/ShardedIntegrationTests.cs
index 2678b78..34f19a5 100644
--- a/src/NHibernate.Shards.Test/ShardedIntegrationTests.cs
+++ b/src/NHibernate.Shards.Test/ShardedIntegrationTests.cs
@@ -397,6 +397,27 @@ public void CanOrderWithHql()
 	        }
 	    }
 
+	    [Test]
+	    public void CanOrderOnIdentifierWithHql()
+	    {
+	        var person1 = new Person { LegalName = new PersonName { FirstName = "John", LastName = "Doe" }, DateOfBirth = new DateTime(1970, 1, 1) };
+	        var person2 = new Person { LegalName = new PersonName { FirstName = "Mary", LastName = "Jane" }, DateOfBirth = new DateTime(1968, 12, 31) };
+
+	        using (var session = SessionFactory.OpenSession())
+	        {
+	            using (session.BeginTransaction())
+	            {
+	                session.Save(person1);
+	                session.Save(person2);
+	                session.Flush();
+	                session.Clear();
+
+	                var persistentPersons = session.CreateQuery("from Person p order by p.Id")
+	                    .List<Person>();
+	                Assert.That(persistentPersons, Is.Ordered.Ascending.By(nameof(Person.Id)));
+	            }
+	        }
+	    }
 
         [Test]
 	    public void GetFutureResultsMoreThanOnceWithHql()
diff --git a/src/NHibernate.Shards/NHibernate.Shards.csproj b/src/NHibernate.Shards/NHibernate.Shards.csproj
index 5e495c7..0b99fe7 100644
--- a/src/NHibernate.Shards/NHibernate.Shards.csproj
+++ b/src/NHibernate.Shards/NHibernate.Shards.csproj
@@ -7,7 +7,7 @@
     <Description>NHibernate Shards is a framework that adds support for horizontal partitioning to NHibernate Core.</Description>
     <Company />
     <PackageProjectUrl>https://github.com/darioquintana/NHibernate-Shards</PackageProjectUrl>
-    <VersionPrefix>5.1.5</VersionPrefix>
+    <VersionPrefix>5.1.6</VersionPrefix>
     <VersionLabel></VersionLabel>
     <VersionRevision>4000</VersionRevision>
     <VersionSuffix Condition="'$(VersionLabel)' != ''">$(VersionLabel)$(VersionRevision)</VersionSuffix>
diff --git a/src/NHibernate.Shards/Query/ShardedQueryExpression.cs b/src/NHibernate.Shards/Query/ShardedQueryExpression.cs
index 696a1c9..5412f6d 100644
--- a/src/NHibernate.Shards/Query/ShardedQueryExpression.cs
+++ b/src/NHibernate.Shards/Query/ShardedQueryExpression.cs
@@ -329,7 +329,9 @@ private void ExtractOrders(IASTNode node)
 
 				this.exitOperationBuilder.Orders.Add(
 					new SortOrder(
-						o => this.rootClassMetadata.GetPropertyValue(o, propertyPath), 
+						o => propertyPath == this.rootClassMetadata.IdentifierPropertyName
+						    ? this.rootClassMetadata.GetIdentifier(o)
+						    : this.rootClassMetadata.GetPropertyValue(o, propertyPath), 
 						isDescending));
 			}
 		}