NH-3414 - Fixed the HqlSqlWalker grammar to correctly handle multiple ORDER clauses with queries or expressions (#473)

Author: PleasantD

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

@@ -0,0 +1,44 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3414
+{
+	public class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual int SomeValue { get; set; }
+
+		public virtual Entity Parent { get; set; }
+
+		private readonly IList<Entity> children = new List<Entity>();
+		public virtual IEnumerable<Entity> Children { get { return children; } }
+
+		public virtual void AddChild(Entity child)
+		{
+			children.Add(child);
+			child.Parent = this;
+		}
+
+		public override string ToString()
+		{
+			return Name + SomeValue;
+		}
+
+		public override bool Equals(object obj)
+		{
+			var other = obj as Entity;
+			if (other == null)
+			{
+				return false;
+			}
+			return other.Id == Id;
+		}
+
+		public override int GetHashCode()
+		{
+			return Id.GetHashCode();
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3414/FixtureByCode.cs

@@ -0,0 +1,164 @@
+using System.Linq;
+using System.Linq.Expressions;
+using Antlr.Runtime.Misc;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3414
+{
+	public class ByCodeFixture : 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);
+				rc.Property(x => x.SomeValue);
+				rc.ManyToOne(x => x.Parent, map => map.Column("ParentId"));
+				rc.Bag(x => x.Children, map =>
+				{
+					map.Access(Accessor.NoSetter);
+					map.Key(km => km.Column("ParentId"));
+					map.Cascade(Mapping.ByCode.Cascade.All.Include(Mapping.ByCode.Cascade.DeleteOrphans));
+				}, rel => rel.OneToMany());
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { 
+					Name = "A", 
+					SomeValue = 1,
+				};
+				e1.AddChild(new Entity { Name = "X", SomeValue = 3 });
+				e1.AddChild(new Entity { Name = "Z", SomeValue = 10 });
+				session.Save(e1);
+
+				var e2 = new Entity
+				{
+					Name = "B",
+					SomeValue = 2,
+				};
+				e2.AddChild(new Entity { Name = "Y", SomeValue = 10 });
+				e2.AddChild(new Entity { Name = "Z", SomeValue = 2 });
+				session.Save(e2);
+
+				var e3 = new Entity
+				{
+					Name = "A",
+					SomeValue = 3,
+				};
+				e3.AddChild(new Entity { Name = "X", SomeValue = 9 });
+				e3.AddChild(new Entity { Name = "Y", SomeValue = 1 });
+				session.Save(e3);
+				
+				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 OrderByNoQueriesTest()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var query = session.Query<Entity>()
+								.Where(x => x.Parent == null)
+								.OrderBy(x => x.Name)	// Expression
+								.ThenBy(x => x.SomeValue);	// Expression
+
+				var results = query.ToList();
+				Assert.That(results.Select(x => x.ToString()), Is.EqualTo(new[] { "A1", "A3", "B2" }));
+			}
+		}
+
+		[Test]
+		public void OrderBySingleQueryTest()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var query = session.Query<Entity>()
+								.Where(x => x.Parent == null)
+								// This could be any expression that generates a subquery
+								.OrderBy(x => x.Children.Select(c => c.SomeValue).Min());
+
+				var results = query.ToList();
+				Assert.That(results.Select(x => x.ToString()), Is.EqualTo(new[] { "A3", "B2", "A1" }));
+			}
+		}
+
+		[Test]
+		public void OrderBySingleQueryComplex()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var query = session.Query<Entity>()
+								.Where(x => x.Parent == null)
+								.OrderBy(x => x.Name)	// Expression
+								// This could be any expression that generates a subquery
+								.ThenBy(x => x.Children.Select(c => c.SomeValue).Min());
+
+				var results = query.ToList();
+				Assert.That(results.Select(x => x.ToString()), Is.EqualTo(new[] { "A3", "A1", "B2" }));
+			}
+		}
+
+		[Test]
+		public void OrderBySingleQueryComplexReverse()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var query = session.Query<Entity>()
+								.Where(x => x.Parent == null)
+								// This could be any expression that generates a subquery
+								.OrderByDescending(x => x.Children.Select(c => c.SomeValue).Max())
+								.ThenBy(x => x.Name);	// Expression
+
+				var results = query.ToList();
+				Assert.That(results.Select(x => x.ToString()), Is.EqualTo(new[] { "A1", "B2", "A3" }));
+			}
+		}
+
+		[Test]
+		public void OrderByMultipleQuery()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var query = session.Query<Entity>()
+								.Where(x => x.Parent == null)
+								// These could be any expressions that generate a subqueries
+								.OrderByDescending(x => x.Children.Select(c => c.SomeValue).Max())
+								.ThenBy(x => x.Children.Select(c => c.SomeValue).Min());
+
+				var results = query.ToList();
+				Assert.That(results.Select(x => x.ToString()), Is.EqualTo(new[] { "B2", "A1", "A3" }));
+			}
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -723,6 +723,8 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Linq\ByMethod\DistinctTests.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
+    <Compile Include="NHSpecificTest\NH3414\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3414\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH2218\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2931\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2931\Mappings.cs" />