typeorm 0.3.25-dev.a9c16ee → 0.3.25-dev.eb3093d

package/browser/query-builder/SelectQueryBuilder.js

@@ -1334,12 +1334,15 @@ export class SelectQueryBuilder extends QueryBuilder {
         // in the case if nothing is joined in the query builder we don't need to make two requests to get paginated results
         // we can use regular limit / offset, that's why we add offset and limit construction here based on skip and take values
         let offset = this.expressionMap.offset, limit = this.expressionMap.limit;
-        if (!offset &&
-            !limit &&
+        if (offset === undefined &&
+            limit === undefined &&
             this.expressionMap.joinAttributes.length === 0) {
             offset = this.expressionMap.skip;
             limit = this.expressionMap.take;
         }
+        // Helper functions to check if values are set (including 0)
+        const hasLimit = limit !== undefined && limit !== null;
+        const hasOffset = offset !== undefined && offset !== null;
         if (this.connection.driver.options.type === "mssql") {
             // Due to a limitation in SQL Server's parser implementation it does not support using
             // OFFSET or FETCH NEXT without an ORDER BY clause being provided. In cases where the
@@ -1347,59 +1350,59 @@ export class SelectQueryBuilder extends QueryBuilder {
             // have no effect on the query planner or on the order of the results returned.
             // https://dba.stackexchange.com/a/193799
             let prefix = "";
-            if ((limit || offset) &&
+            if ((hasLimit || hasOffset) &&
                 Object.keys(this.expressionMap.allOrderBys).length <= 0) {
                 prefix = " ORDER BY (SELECT NULL)";
             }
-            if (limit && offset)
+            if (hasLimit && hasOffset)
                 return (prefix +
                     " OFFSET " +
                     offset +
                     " ROWS FETCH NEXT " +
                     limit +
                     " ROWS ONLY");
-            if (limit)
+            if (hasLimit)
                 return (prefix + " OFFSET 0 ROWS FETCH NEXT " + limit + " ROWS ONLY");
-            if (offset)
+            if (hasOffset)
                 return prefix + " OFFSET " + offset + " ROWS";
         }
         else if (DriverUtils.isMySQLFamily(this.connection.driver) ||
             this.connection.driver.options.type === "aurora-mysql" ||
             this.connection.driver.options.type === "sap" ||
             this.connection.driver.options.type === "spanner") {
-            if (limit && offset)
+            if (hasLimit && hasOffset)
                 return " LIMIT " + limit + " OFFSET " + offset;
-            if (limit)
+            if (hasLimit)
                 return " LIMIT " + limit;
-            if (offset)
+            if (hasOffset)
                 throw new OffsetWithoutLimitNotSupportedError();
         }
         else if (DriverUtils.isSQLiteFamily(this.connection.driver)) {
-            if (limit && offset)
+            if (hasLimit && hasOffset)
                 return " LIMIT " + limit + " OFFSET " + offset;
-            if (limit)
+            if (hasLimit)
                 return " LIMIT " + limit;
-            if (offset)
+            if (hasOffset)
                 return " LIMIT -1 OFFSET " + offset;
         }
         else if (this.connection.driver.options.type === "oracle") {
-            if (limit && offset)
+            if (hasLimit && hasOffset)
                 return (" OFFSET " +
                     offset +
                     " ROWS FETCH NEXT " +
                     limit +
                     " ROWS ONLY");
-            if (limit)
+            if (hasLimit)
                 return " FETCH NEXT " + limit + " ROWS ONLY";
-            if (offset)
+            if (hasOffset)
                 return " OFFSET " + offset + " ROWS";
         }
         else {
-            if (limit && offset)
+            if (hasLimit && hasOffset)
                 return " LIMIT " + limit + " OFFSET " + offset;
-            if (limit)
+            if (hasLimit)
                 return " LIMIT " + limit;
-            if (offset)
+            if (hasOffset)
                 return " OFFSET " + offset;
         }
         return "";