Change SqlServer Window RowNum expression to use aliases when provided

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

@@ -412,7 +412,7 @@ public override string ToSelectStatement(ModelDefinition modelDef,
 
             var ret = string.Format(
                 "{0} FROM (SELECT ROW_NUMBER() OVER ({2}) As RowNum, {1} {3}) AS RowConstrainedResult WHERE RowNum > {4} AND RowNum <= {5}",
-                selectExpression.StripTablePrefixes(), //SELECT without RowNum to be able to use in SELECT IN () Reference Queries
+                UseAliasesOrStripTablePrefixes(selectExpression), 
                 selectExpression.Substring(selectType.Length),
                 orderByExpression,
                 bodyExpression,
@@ -421,5 +421,43 @@ public override string ToSelectStatement(ModelDefinition modelDef,
 
             return ret;
         }
+
+        //SELECT without RowNum and prefer aliases to be able to use in SELECT IN () Reference Queries
+        public static string UseAliasesOrStripTablePrefixes(string selectExpression)
+        {
+            if (selectExpression.IndexOf('.') < 0)
+                return selectExpression;
+
+            var sb = new StringBuilder();
+            var selectToken = selectExpression.SplitOnFirst(' ');
+            var tokens = selectToken[1].Split(',');
+            foreach (var token in tokens)
+            {
+                if (sb.Length > 0)
+                    sb.Append(", ");
+
+                var field = token.Trim();
+
+                var aliasParts = field.SplitOnLast(' ');
+                if (aliasParts.Length > 1)
+                {
+                    sb.Append(" " + aliasParts[aliasParts.Length - 1]);
+                    continue;
+                }
+
+                var parts = field.SplitOnLast('.');
+                if (parts.Length > 1)
+                {
+                    sb.Append(" " + parts[parts.Length - 1]);
+                }
+                else
+                {
+                    sb.Append(" " + field);
+                }
+            }
+
+            var sqlSelect = selectToken[0] + " " + sb.ToString().Trim();
+            return sqlSelect;
+        }
     }
 }

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

@@ -82,6 +82,49 @@ internal class JoinResult
         public string BazName { get; set; }
     }
 
+    public class Product : IHasGuidId
+    {
+        [PrimaryKey]
+        public Guid Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        [Required]
+        [Alias("fkManufacturerId")]
+        [ForeignKey(typeof(Manufacturer), ForeignKeyName = "fk_Product_Manufacturer")]
+        public Guid ManufacturerId { get; set; }
+    }
+
+    public class Manufacturer : IHasGuidId
+    {
+        [PrimaryKey]
+        public Guid Id { get; set; }
+
+        public string Name { get; set; }
+    }
+
+    public class ProductWithManufacturer
+    {
+        [BelongTo(typeof(Product))]
+        public Guid ProductId { get; set; }
+
+        [BelongTo(typeof(Product))]
+        public string ProductName { get; set; }
+
+        [BelongTo(typeof(Product))]
+        public string Code { get; set; }
+
+        [BelongTo(typeof(Product))]
+        [Alias("fkManufacturerId")]
+        public Guid ManufacturerId { get; set; }
+
+        [BelongTo(typeof(Manufacturer))]
+        public string ManufacturerName { get; set; }
+    }
+
     [TestFixture]
     public class ComplexJoinTests : OrmLiteTestBase
     {
@@ -177,5 +220,55 @@ public void ComplexJoin_with_SqlExpression()
                 Assert.That(fooBarBaz.BazId, Is.EqualTo(1));
             }
         }
+
+        [Test]
+        public void Can_limit_ComplexJoin_query()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropTable<Product>();
+                db.DropTable<Manufacturer>();
+
+                db.CreateTable<Manufacturer>();
+                db.CreateTable<Product>();
+
+                var manufacturer = new Manufacturer
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "ManName",
+                };
+                db.Insert(manufacturer);
+                db.Insert(new Product
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "SA1 ProductName",
+                    Code = "CODE A",
+                    ManufacturerId = manufacturer.Id,
+                });
+                db.Insert(new Product
+                {
+                    Id = Guid.NewGuid(),
+                    Name = "SA2 ProductName",
+                    Code = "CODE B",
+                    ManufacturerId = manufacturer.Id,
+                });
+
+                var q = db.From<Product>()
+                    .Join<Manufacturer>((p, m) => p.ManufacturerId == m.Id)
+                    .Where<Product>(p => p.Name.Contains("SA"))
+                    .OrderBy<Product>(p => p.Name)
+                    .Limit(1, 25);
+
+                var results = db.Select<ProductWithManufacturer>(q);
+
+                db.GetLastSql().Print();
+
+                Assert.That(results[0].ManufacturerName, Is.EqualTo(manufacturer.Name));
+                Assert.That(results[0].ManufacturerId, Is.EqualTo(manufacturer.Id));
+                Assert.That(results[0].Code, Is.EqualTo("CODE B"));
+
+                results.PrintDump();
+            }
+        }
     }
 }