Change OrderBy to orderByProperties

Author: mythz

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -683,9 +683,11 @@ public virtual SqlExpression<T> OrderBy(long columnIndex)
         public virtual SqlExpression<T> UnsafeOrderBy(string orderBy)
         {
             orderByProperties.Clear();
-            this.orderBy = string.IsNullOrEmpty(orderBy)
-                ? null
-                : "ORDER BY " + orderBy;
+            if (!string.IsNullOrEmpty(orderBy))
+            {
+                orderByProperties.Add(orderBy);
+            }
+            BuildOrderByClauseInternal();
             return this;
         }
 

src/ServiceStack.OrmLite/IOrmLiteConverter.cs

@@ -40,7 +40,7 @@ public abstract class OrmLiteConverter : IOrmLiteConverter
         public IOrmLiteDialectProvider DialectProvider { get; set; }
 
         /// <summary>
-        /// SQL Column Definiton used in CREATE Table. 
+        /// SQL Column Definition used in CREATE Table. 
         /// </summary>
         public abstract string ColumnDefinition { get; }
 

tests/ServiceStack.OrmLite.Tests/OrderByTests.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using ServiceStack.OrmLite.Tests.Expression;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests
 {
@@ -29,5 +30,28 @@ public void Can_order_by_random()
                 Assert.That(!rowIds1.SequenceEqual(rowIds2));
             }
         }
+
+        [Test]
+        public void Can_OrderBy_and_ThenBy()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<LetterFrequency>();
+
+                db.Insert(new LetterFrequency {Letter = "C" });
+                db.Insert(new LetterFrequency {Letter = "C" });
+                db.Insert(new LetterFrequency {Letter = "B" });
+                db.Insert(new LetterFrequency {Letter = "A" });
+
+                var q = db.From<LetterFrequency>();
+                q.OrderBy(nameof(LetterFrequency.Letter))
+                    .ThenBy(nameof(LetterFrequency.Id));
+
+                var tracks = db.Select(q);
+                
+                Assert.That(tracks.First().Letter, Is.EqualTo("A"));
+                Assert.That(tracks.Last().Letter, Is.EqualTo("C"));
+            }
+        }        
     }
 }