Merge pull request #264 from UriHendler/master

Fixed SQL Server Limit issue #263

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServerExpressionVisitor.cs

@@ -56,7 +56,6 @@ public override string ToSelectStatement()
 
         public override string ToUpdateStatement(T item, bool excludeDefaults = false)
         {
-
             var setFields = new StringBuilder();
             var dialectProvider = OrmLiteConfig.DialectProvider;
 
@@ -92,7 +91,7 @@ protected virtual string BuildOrderByIdExpression()
 	        if (ModelDef.PrimaryKey == null)
                 throw new ApplicationException("Malformed model, no PrimaryKey defined");
 
-	        return String.Format("ORDER BY {0}", ModelDef.PrimaryKey.FieldName);
+	        return String.Format("ORDER BY {0}", OrmLiteConfig.DialectProvider.GetQuotedColumnName(ModelDef.PrimaryKey.FieldName));
 	    }
 
 		public override string LimitExpression

src/ServiceStack.OrmLite.SqlServerTests/ServiceStack.OrmLite.SqlServerTests.csproj

@@ -82,6 +82,7 @@
     <Compile Include="TypeWithByteArrayFieldTests.cs" />
     <Compile Include="UnicodeTests.cs" />
     <Compile Include="UpdateTests.cs" />
+    <Compile Include="UseCase\TestEntityWithAliases.cs" />
     <Compile Include="UseCase\SimpleUseCase.cs" />
     <Compile Include="UseCase\TestEntity.cs" />
   </ItemGroup>

src/ServiceStack.OrmLite.SqlServerTests/SqlServerExpressionVisitorQueryTest.cs

@@ -124,6 +124,40 @@ public void test_if_and_works_with_nullable_parameter()
                 Assert.IsTrue(result.Count > 0);
             }
         }
+
+        [Test]
+        public void test_if_limit_works_with_rows_and_skip_if_pk_columnname_has_space()
+        {
+            using (var db = ConnectionString.OpenDbConnection())
+            {
+                FillAliasedTestEntityTableWithTestData(db);
+
+                var ev = OrmLiteConfig.DialectProvider.ExpressionVisitor<TestEntityWithAliases>();
+                ev.Limit(10, 100);
+
+                var result = db.Select(ev);
+                Assert.NotNull(result);
+                Assert.AreEqual(100, result.Count);
+            }
+        }
+
+        [Test]
+        public void test_if_limit_works_with_rows_and_skip_and_orderby_if_pk_columnname_has_space()
+        {
+            using (var db = ConnectionString.OpenDbConnection())
+            {
+                FillAliasedTestEntityTableWithTestData(db);
+
+                var ev = OrmLiteConfig.DialectProvider.ExpressionVisitor<TestEntityWithAliases>();
+                ev.Limit(10, 100);
+                ev.OrderBy(e => e.Baz);
+
+                var result = db.Select(ev);
+                Assert.NotNull(result);
+                Assert.AreEqual(100, result.Count);
+                Assert.LessOrEqual(result[10].Baz, result[11].Baz);
+            }
+        }
 
         protected void FillTestEntityTableWithTestData(IDbConnection db)
         {
@@ -140,6 +174,21 @@ protected void FillTestEntityTableWithTestData(IDbConnection db)
             }
         }
 
+        protected void FillAliasedTestEntityTableWithTestData(IDbConnection db)
+        {
+            db.CreateTable<TestEntityWithAliases>(true);
+
+            for (int i = 1; i < 1000; i++)
+            {
+                db.Insert(new TestEntityWithAliases()
+                {
+                    Foo = RandomString(16),
+                    Bar = RandomString(16),
+                    Baz = RandomDecimal(i)
+                });
+            }
+        }
+
         protected string RandomString(int length)
         {
             var rnd = new System.Random();

src/ServiceStack.OrmLite.SqlServerTests/UseCase/TestEntityWithAliases.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ServiceStack.DataAnnotations;
+
+namespace ServiceStack.OrmLite.SqlServerTests.UseCase
+{
+    public class TestEntityWithAliases
+    {
+        #region Properties
+
+        [AutoIncrement]
+        [Alias("Id Column")]
+        public int Id { get; set; }
+
+        [Alias("Foo Column")]
+        public String Foo { get; set; }
+
+        [Alias("Bar Column")]
+        public String Bar { get; set; }
+
+        //[Index]
+        [Alias("Baz Column")]
+        public Decimal Baz { get; set; }
+        
+        #endregion
+    }
+}