Fix Sql Server windowing function when used in Tables with references

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Text;
 using ServiceStack.Text;
+using ServiceStack;
 
 namespace ServiceStack.OrmLite.SqlServer
 {
@@ -406,11 +407,12 @@ public override string ToSelectStatement(ModelDefinition modelDef,
                     throw new ApplicationException("Malformed model, no PrimaryKey defined");
 
                 orderByExpression = string.Format("ORDER BY {0}",
-                    OrmLiteConfig.DialectProvider.GetQuotedColumnName(modelDef.PrimaryKey.FieldName));
+                    OrmLiteConfig.DialectProvider.GetQuotedColumnName(modelDef, modelDef.PrimaryKey));
             }
 
             var ret = string.Format(
-                "SELECT * FROM (SELECT ROW_NUMBER() OVER ({1}) As RowNum, {0} {2}) AS RowConstrainedResult WHERE RowNum > {3} AND RowNum <= {4}",
+                "{0} FROM (SELECT ROW_NUMBER() OVER ({2}) As RowNum, {1} {3}) AS RowConstrainedResult WHERE RowNum > {4} AND RowNum <= {5}",
+                StripTablePrefixes(selectExpression), //SELECT without RowNum to be able to use in SELECT IN () Reference Queries
                 selectExpression.Substring(selectType.Length),
                 orderByExpression,
                 bodyExpression,
@@ -419,5 +421,29 @@ public override string ToSelectStatement(ModelDefinition modelDef,
 
             return ret;
         }
+
+        string StripTablePrefixes(string selectExpression)
+        {
+            if (selectExpression.IndexOf('.') < 0)
+                return selectExpression;
+
+            var sb = new StringBuilder();
+            var tokens = selectExpression.Split(' ');
+            foreach (var token in tokens)
+            {
+                var parts = token.SplitOnLast('.');
+                if (parts.Length > 1)
+                {
+                    sb.Append(" " + parts[parts.Length - 1]);
+                }
+                else
+                {
+                    sb.Append(" " + token);
+                }
+            }
+
+            return sb.ToString();
+        }
+
     }
 }

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

@@ -4,6 +4,7 @@
 using System.Linq;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite.Tests.UseCase;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests.Expression
@@ -268,7 +269,47 @@ public void Can_OrderBy_Fields_with_different_sort_directions()
                 Assert.That(rows.Map(x => x.Letter), Is.EquivalentTo("E,D,D,C,C,C,B,B,A".Split(',')));
                 Assert.That(rows.Map(x => x.Id), Is.EquivalentTo(Enumerable.Reverse(insertedIds)));
             }
+        }
+
+        [Test]
+        public void Can_select_limit_on_Table_with_References()
+        {
+            using (var db = OpenDbConnection())
+            {
+                CustomerOrdersUseCase.DropTables(db); //Has conflicting 'Order' table
+                db.DropAndCreateTable<Order>();
+                db.DropAndCreateTable<Customer>();
+                db.DropAndCreateTable<CustomerAddress>();
+
+                var customer1 = LoadReferencesTests.GetCustomerWithOrders("1");
+                db.Save(customer1, references: true);
+
+                var customer2 = LoadReferencesTests.GetCustomerWithOrders("2");
+                db.Save(customer2, references: true);
 
+                var results = db.LoadSelect<Customer>(q => q
+                    .OrderBy(x => x.Id)
+                    .Limit(1, 1));
+
+                //db.GetLastSql().Print();
+
+                Assert.That(results.Count, Is.EqualTo(1));
+                Assert.That(results[0].Name, Is.EqualTo("Customer 2"));
+                Assert.That(results[0].PrimaryAddress.AddressLine1, Is.EqualTo("2 Humpty Street"));
+                Assert.That(results[0].Orders.Count, Is.EqualTo(2));
+
+                results = db.LoadSelect<Customer>(q => q
+                    .Join<CustomerAddress>()
+                    .OrderBy(x => x.Id)
+                    .Limit(1, 1));
+
+                db.GetLastSql().Print();
+
+                Assert.That(results.Count, Is.EqualTo(1));
+                Assert.That(results[0].Name, Is.EqualTo("Customer 2"));
+                Assert.That(results[0].PrimaryAddress.AddressLine1, Is.EqualTo("2 Humpty Street"));
+                Assert.That(results[0].Orders.Count, Is.EqualTo(2));
+            }
         }
     }
 }

tests/ServiceStack.OrmLite.Tests/LoadReferencesTests.cs

@@ -337,26 +337,32 @@ public void Can_Save_and_Load_MismatchedAlias_References_using_code_conventions(
         }
 
         private Customer AddCustomerWithOrders()
+        {
+            var customer = GetCustomerWithOrders();
+
+            db.Save(customer, references: true);
+
+            return customer;
+        }
+
+        public static Customer GetCustomerWithOrders(string id="1")
         {
             var customer = new Customer
             {
-                Name = "Customer 1",
+                Name = "Customer " + id,
                 PrimaryAddress = new CustomerAddress
-                {
-                    AddressLine1 = "1 Humpty Street",
-                    City = "Humpty Doo",
-                    State = "Northern Territory",
-                    Country = "Australia"
-                },
+                    {
+                        AddressLine1 = id + " Humpty Street",
+                        City = "Humpty Doo",
+                        State = "Northern Territory",
+                        Country = "Australia"
+                    },
                 Orders = new[]
-                {
-                    new Order {LineItem = "Line 1", Qty = 1, Cost = 1.99m},
-                    new Order {LineItem = "Line 2", Qty = 2, Cost = 2.99m},
-                }.ToList(),
+                    {
+                        new Order {LineItem = "Line 1", Qty = 1, Cost = 1.99m},
+                        new Order {LineItem = "Line 2", Qty = 2, Cost = 2.99m},
+                    }.ToList(),
             };
-
-            db.Save(customer, references: true);
-
             return customer;
         }