Refactor out and add SqlLimit

ServiceStack · Aug 12, 2017 · e4bca5d · e4bca5d
1 parent 87563f7
commit e4bca5d
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 18 deletions.
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServer2012OrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServer2012OrmLiteDialectProvider.cs
@@ -35,10 +35,7 @@ public override string ToSelectStatement(ModelDefinition modelDef,
                     sb.Append(" ORDER BY " + orderBy);
                 }
 
-                sb.Append(" OFFSET ").Append(offset.GetValueOrDefault()).Append(" ROWS");
-
-                if (rows != null)
-                    sb.Append(" FETCH NEXT ").Append(rows.Value).Append(" ROWS ONLY");
+                sb.Append(" ").Append(SqlLimit(offset, rows));
             }
 
             return StringBuilderCache.ReturnAndFree(sb);

diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -360,6 +360,12 @@ public override string SqlCurrency(string fieldOrValue, string currencySymbol) =
 
         public override string SqlBool(bool value) => value ? "1" : "0";
 
+        public override string SqlLimit(int? offset = null, int? rows = null) => rows == null && offset == null
+            ? ""
+            : rows != null
+                ? "OFFSET " + offset.GetValueOrDefault() + " ROWS FETCH NEXT " + rows
+                : "OFFSET " + offset.GetValueOrDefault(int.MaxValue) + " ROWS";
+
         protected SqlConnection Unwrap(IDbConnection db) => (SqlConnection)db.ToDbConnection();
 
         protected SqlCommand Unwrap(IDbCommand cmd) => (SqlCommand)cmd.ToDbCommand();

diff --git a/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs
@@ -216,5 +216,6 @@ string ToCreateIndexStatement<T>(Expression<Func<T, object>> field,
         string SqlCurrency(string fieldOrValue);
         string SqlCurrency(string fieldOrValue, string currencySymbol);
         string SqlBool(bool value);
+        string SqlLimit(int? offset = null, int? rows = null);
     }
 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -542,15 +542,8 @@ public virtual string ToSelectStatement(ModelDefinition modelDef,
 
             if (offset != null || rows != null)
             {
-                sb.Append("\nLIMIT ");
-                if (offset == null)
-                {
-                    sb.Append(rows);
-                }
-                else
-                {
-                    sb.Append(rows.GetValueOrDefault(int.MaxValue)).Append(" OFFSET ").Append(offset);
-                }
+                sb.Append("\n");
+                sb.Append(SqlLimit(offset, rows));
             }
 
             return StringBuilderCache.ReturnAndFree(sb);
@@ -1590,6 +1583,12 @@ protected virtual string ToDropColumnStatement(Type modelType, string columnName
 
         public virtual string SqlBool(bool value) => value ? "true" : "false";
 
+        public virtual string SqlLimit(int? offset = null, int? rows = null) => rows == null && offset == null
+            ? "" 
+            : offset == null
+                ? "LIMIT " + rows
+                : "LIMIT " + rows.GetValueOrDefault(int.MaxValue) + " OFFSET " + offset;
+
         //Async API's, should be overrided by Dialect Providers to use .ConfigureAwait(false)
         //Default impl below uses TaskAwaiter shim in async.cs
 

diff --git a/tests/ServiceStack.OrmLite.Tests/AutoQueryTests.cs b/tests/ServiceStack.OrmLite.Tests/AutoQueryTests.cs
@@ -447,7 +447,7 @@ public void Can_group_by_multiple_columns()
 
                 var q = db.From<Rockstar>()
                     .Join<RockstarAlbum>()
-                    .GroupBy<Rockstar, RockstarAlbum>((r, a) => new { r.Id, AlbumId = a.Id })
+                    .GroupBy<Rockstar, RockstarAlbum>((r, a) => new { r.Id, AlbumId = a.Id, r.FirstName, r.LastName, a.Name })
                     .Select<Rockstar, RockstarAlbum>((r,a) => new
                     {
                         r.Id,

diff --git a/tests/ServiceStack.OrmLite.Tests/DbExtensionTests.cs b/tests/ServiceStack.OrmLite.Tests/DbExtensionTests.cs
@@ -16,7 +16,7 @@ public void Can_get_TableName()
                 var quotedTable1 = db.GetQuotedTableName<Table1>();
 
                 Assert.That(table1.ToLower(), Is.EqualTo("table1"));
-                Assert.That(quotedTable1.ToLower(), Is.EqualTo("\"table1\""));
+                Assert.That(quotedTable1.ToLower(), Is.EqualTo("\"table1\"").Or.EqualTo("`table1`"));
 
                 if (Dialect == Dialect.Sqlite)
                 {

diff --git a/tests/ServiceStack.OrmLite.Tests/DefaultValueTests.cs b/tests/ServiceStack.OrmLite.Tests/DefaultValueTests.cs
@@ -122,11 +122,13 @@ private static void ResetUpdateDate(IDbConnection db)
             db.Update<DefaultValues>(new { UpdatedDateUtc = updateTime }, p => p.Id == 1);
         }
 
-        private static void VerifyUpdateDate(IDbConnection db, int id = 1)
+        private void VerifyUpdateDate(IDbConnection db, int id = 1)
         {
             var row = db.SingleById<DefaultValues>(id);
             row.PrintDump();
-            Assert.That(row.UpdatedDateUtc, Is.GreaterThan(DateTime.UtcNow - TimeSpan.FromMinutes(5)));
+
+            if (Dialect != Dialect.MySql) //not returning UTC
+                Assert.That(row.UpdatedDateUtc, Is.GreaterThan(DateTime.UtcNow - TimeSpan.FromMinutes(5)));
         }
 
         [Test]

diff --git a/tests/ServiceStack.OrmLite.Tests/Expression/SqlCustomTests.cs b/tests/ServiceStack.OrmLite.Tests/Expression/SqlCustomTests.cs
@@ -35,7 +35,7 @@ public class SqlCustomTests : OrmLiteTestBase
         [Test]
         public void Can_use_CustomSelect_field_in_Typed_Query()
         {
-            if (Dialect == Dialect.PostgreSql) return;
+            if (Dialect == Dialect.PostgreSql || Dialect == Dialect.SqlServer || Dialect == Dialect.MySql) return;
 
             using (var db = OpenDbConnection())
             {