Add support for OrderBy a joined table

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -361,7 +361,17 @@ public virtual SqlExpression<T> OrderByFieldsDescending(params string[] fieldNam
             return OrderByFields(" DESC", fieldNames);
         }
 
-        public virtual SqlExpression<T> OrderBy<TKey>(Expression<Func<T, TKey>> keySelector)
+        public virtual SqlExpression<T> OrderBy(Expression<Func<T, object>> keySelector)
+        {
+            return OrderByInternal(keySelector);
+        }
+
+        public virtual SqlExpression<T> OrderBy<Table>(Expression<Func<Table, object>> keySelector)
+        {
+            return OrderByInternal(keySelector);
+        }
+
+        private SqlExpression<T> OrderByInternal(Expression keySelector)
         {
             sep = string.Empty;
             useFieldName = true;
@@ -380,7 +390,17 @@ public virtual SqlExpression<T> ThenBy(string orderBy)
             return this;
         }
 
-        public virtual SqlExpression<T> ThenBy<TKey>(Expression<Func<T, TKey>> keySelector)
+        public virtual SqlExpression<T> ThenBy(Expression<Func<T, object>> keySelector)
+        {
+            return ThenByInternal(keySelector);
+        }
+
+        public virtual SqlExpression<T> ThenBy<Table>(Expression<Func<Table, object>> keySelector)
+        {
+            return ThenByInternal(keySelector);
+        }
+
+        private SqlExpression<T> ThenByInternal(Expression keySelector)
         {
             sep = string.Empty;
             useFieldName = true;
@@ -390,7 +410,17 @@ public virtual SqlExpression<T> ThenBy<TKey>(Expression<Func<T, TKey>> keySelect
             return this;
         }
 
-        public virtual SqlExpression<T> OrderByDescending<TKey>(Expression<Func<T, TKey>> keySelector)
+        public virtual SqlExpression<T> OrderByDescending(Expression<Func<T, object>> keySelector)
+        {
+            return OrderByDescendingInternal(keySelector);
+        }
+
+        public virtual SqlExpression<T> OrderByDescending<Table>(Expression<Func<Table, object>> keySelector)
+        {
+            return OrderByDescendingInternal(keySelector);
+        }
+
+        private SqlExpression<T> OrderByDescendingInternal(Expression keySelector)
         {
             sep = string.Empty;
             useFieldName = true;
@@ -409,7 +439,17 @@ public virtual SqlExpression<T> ThenByDescending(string orderBy)
             return this;
         }
 
-        public virtual SqlExpression<T> ThenByDescending<TKey>(Expression<Func<T, TKey>> keySelector)
+        public virtual SqlExpression<T> ThenByDescending(Expression<Func<T, object>> keySelector)
+        {
+            return ThenByDescendingInternal(keySelector);
+        }
+
+        public virtual SqlExpression<T> ThenByDescending<Table>(Expression<Func<Table, object>> keySelector)
+        {
+            return ThenByDescendingInternal(keySelector);
+        }
+
+        private SqlExpression<T> ThenByDescendingInternal(Expression keySelector)
         {
             sep = string.Empty;
             useFieldName = true;

tests/ServiceStack.OrmLite.Tests/Expression/SqlExpressionTests.cs

@@ -356,6 +356,7 @@ public class TableB
         {
             public int Id { get; set; }
             public int TableAId { get; set; }
+            public string Name { get; set; }
         }
 
         [Test]
@@ -394,5 +395,37 @@ public void Can_query_bools()
                 Assert.That(result.Id, Is.EqualTo(1));
             }
         }
+
+        [Test]
+        public void Can_order_by_Joined_table()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<TableA>();
+                db.DropAndCreateTable<TableB>();
+
+                db.Insert(new TableA { Id = 1, Bool = false });
+                db.Insert(new TableA { Id = 2, Bool = true });
+                db.Insert(new TableB { Id = 1, TableAId = 1, Name = "Z" });
+                db.Insert(new TableB { Id = 2, TableAId = 2, Name = "A" });
+
+                var q = db.From<TableA>()
+                    .Join<TableB>()
+                    .OrderBy(x => x.Id);
+
+                var rows = db.Select(q);
+                db.GetLastSql().Print();
+                Assert.That(rows.Map(x => x.Id), Is.EqualTo(new[] {1, 2}));
+
+
+                q = db.From<TableA>()
+                    .Join<TableB>()
+                    .OrderBy<TableB>(x => x.Name);
+
+                rows = db.Select(q);
+                db.GetLastSql().Print();
+                Assert.That(rows.Map(x => x.Id), Is.EqualTo(new[] { 2, 1 }));
+            }
+        }
     }
 }