fix: using limit and offset together in MSSql

Thanks to @ykphuah
cube-js · Jul 30, 2020 · 9ba875c · 9ba875c
1 parent 280bf19
commit 9ba875c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/cubejs-schema-compiler/adapter/MssqlQuery.js b/packages/cubejs-schema-compiler/adapter/MssqlQuery.js
@@ -75,10 +75,17 @@ class MssqlQuery extends BaseQuery {
   }
 
   groupByDimensionLimit() {
-    return this.offset ? ` OFFSET ${parseInt(this.offset, 10)} ROWS` : '';
+    if (this.rowLimit) {
+      return this.offset ? ` OFFSET ${parseInt(this.offset, 10)} ROWS FETCH NEXT ${parseInt(this.rowLimit, 10)} ROWS ONLY` : '';
+    } else {
+      return this.offset ? ` OFFSET ${parseInt(this.offset, 10)} ROWS` : '';
+    }
   }
 
   topLimit() {
+    if (this.offset) {
+      return '';
+    }
     return this.rowLimit === null ? '' : ` TOP ${this.rowLimit && parseInt(this.rowLimit, 10) || 10000}`;
   }