Fixed joined table ordering issue (ThatRendle#221)

ThatRendle · ThatRendle · commit 4248865cf2b8 · 2012-08-30T00:48:10.000+01:00
diff --git a/Simple.Data.Ado/QueryBuilderBase.cs b/Simple.Data.Ado/QueryBuilderBase.cs
@@ -303,13 +303,19 @@ protected virtual void HandleOrderBy()
         protected string ToOrderByDirective(OrderByClause item)
         {
             string name;
-            if (_columns.Any(r => (!string.IsNullOrWhiteSpace(r.GetAlias())) && r.GetAlias().Equals(item.Reference.GetName())))
+            if (!string.IsNullOrWhiteSpace(item.Reference.GetOwner().GetAlias()))
+            {
+                name = string.Format("{0}.{1}", _schema.QuoteObjectName(item.Reference.GetOwner().GetAlias()),
+                                     _schema.QuoteObjectName(item.Reference.GetName()));
+            }
+            else if (_columns.Any(r => (!string.IsNullOrWhiteSpace(r.GetAlias())) && r.GetAlias().Equals(item.Reference.GetName())))
             {
                 name = item.Reference.GetName();
             }
-            else
-            {
-                name = _table.FindColumn(item.Reference.GetName()).QualifiedName;
+            else
+            {
+                var table = _schema.FindTable(item.Reference.GetOwner().GetName());
+                name = table.FindColumn(item.Reference.GetName()).QualifiedName;
             }
 
             var direction = item.Direction == OrderByDirection.Descending ? " DESC" : string.Empty;
diff --git a/Simple.Data.SqlTest/QueryTest.cs b/Simple.Data.SqlTest/QueryTest.cs
@@ -1,5 +1,6 @@
 &#65279;using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 
@@ -427,6 +428,20 @@ public void SelfJoinShouldNotThrowException()
 
             Assert.AreEqual(1, kingsSubordinates.Count);
         }
+        
+        [Test]
+        public void OrderByOnJoinedColumnShouldUseJoinedColumn()
+        {
+            var traceListener = new TestTraceListener();
+            Trace.Listeners.Add(traceListener);
+            var db = DatabaseHelper.Open();
+
+            var q = db.Employees.Query().LeftJoin(db.Employees.As("Manager"), Id: db.Employees.ManagerId);
+            q = q.Select(db.Employees.Name, q.Manager.Name.As("Manager"));
+            List<dynamic> employees = q.OrderBy(q.Manager.Name).ToList();
+            Trace.Listeners.Remove(traceListener);
+            Assert.Greater(traceListener.Output.IndexOf("order by [manager].[name]", StringComparison.OrdinalIgnoreCase), 0);
+        }
 
         [Test]
         public void CanFetchMoreThanOneHundredRows()

Original file line number	Diff line number	Diff line change
`@@ -303,13 +303,19 @@ protected virtual void HandleOrderBy()`
`303`	`303`	`protected string ToOrderByDirective(OrderByClause item)`
`304`	`304`	`{`
`305`	`305`	`string name;`
`306`		`- if (_columns.Any(r => (!string.IsNullOrWhiteSpace(r.GetAlias())) && r.GetAlias().Equals(item.Reference.GetName())))`
	`306`	`+ if (!string.IsNullOrWhiteSpace(item.Reference.GetOwner().GetAlias()))`
	`307`	`+ {`
	`308`	`+ name = string.Format("{0}.{1}", _schema.QuoteObjectName(item.Reference.GetOwner().GetAlias()),`
	`309`	`+ _schema.QuoteObjectName(item.Reference.GetName()));`
	`310`	`+ }`
	`311`	`+ else if (_columns.Any(r => (!string.IsNullOrWhiteSpace(r.GetAlias())) && r.GetAlias().Equals(item.Reference.GetName())))`
`307`	`312`	`{`
`308`	`313`	`name = item.Reference.GetName();`
`309`	`314`	`}`
`310`		`- else`
`311`		`- {`
`312`		`- name = _table.FindColumn(item.Reference.GetName()).QualifiedName;`
	`315`	`+ else`
	`316`	`+ {`
	`317`	`+ var table = _schema.FindTable(item.Reference.GetOwner().GetName());`
	`318`	`+ name = table.FindColumn(item.Reference.GetName()).QualifiedName;`
`313`	`319`	`}`
`314`	`320`
`315`	`321`	`var direction = item.Direction == OrderByDirection.Descending ? " DESC" : string.Empty;`