mythix-orm-sql-base 1.4.3 → 1.4.4

package/lib/sql-connection-base.js

@@ -65,6 +65,14 @@ class SQLConnectionBase extends ConnectionBase {
     }
   }
 
+  databaseSupportsLimitInSubQuery() {
+    return false;
+  }
+
+  databaseSupportsOrderInSubQuery() {
+    return false;
+  }
+
   prepareArrayValuesForSQL(_array) {
     let array = Nife.arrayFlatten(_array);
 
@@ -84,17 +92,6 @@ class SQLConnectionBase extends ConnectionBase {
     return Nife.uniq(array);
   }
 
-  getDefaultOrder(Model, options) {
-    let order = Nife.toArray(Model.getDefaultOrder(options));
-
-    order = Nife.arrayFlatten(order).filter(Boolean);
-
-    if (Nife.isEmpty(order))
-      return;
-
-    return order;
-  }
-
   generateSavePointName() {
     let id = UUID.v4();
 

package/lib/sql-query-generator-base.js

@@ -527,21 +527,32 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     let sqlParts = [];
 
     if (Nife.isNotEmpty(order)) {
-      let result = this.generateOrderClause(order, options);
-      if (result)
-        sqlParts.push(result);
+      if (!(options && options.isSubQuery) || (options && options.isSubQuery && this.connection.databaseSupportsOrderInSubQuery())) {
+        let result = this.generateOrderClause(order, options);
+        if (result)
+          sqlParts.push(result);
+
+        if (!(Nife.instanceOf(limit, 'number') && isFinite(limit)) && options && options.forceLimit) {
+          limit = options.forceLimit;
+          offset = 0;
+        }
+      }
     }
 
     if (!Object.is(limit, Infinity) && Nife.isNotEmpty(limit)) {
-      let result = this.generateLimitClause(limit, options);
-      if (result)
-        sqlParts.push(result);
+      if (!(options && options.isSubQuery) || (options && options.isSubQuery && this.connection.databaseSupportsLimitInSubQuery())) {
+        let result = this.generateLimitClause(limit, options);
+        if (result)
+          sqlParts.push(result);
+      }
     }
 
     if (Nife.isNotEmpty(offset)) {
-      let result = this.generateOffsetClause(offset, options);
-      if (result)
-        sqlParts.push(result);
+      if (!(options && options.isSubQuery) || (options && options.isSubQuery && this.connection.databaseSupportsLimitInSubQuery())) {
+        let result = this.generateOffsetClause(offset, options);
+        if (result)
+          sqlParts.push(result);
+      }
     }
 
     return sqlParts.join(' ');
@@ -1071,9 +1082,10 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
           queryEngine = queryEngine.PROJECT(`${Model.getModelName()}:${pkField.fieldName}`);
 
         let innerSelect       = this.generateSelectStatement(queryEngine, this.stackAssign(options, { isSubQuery: true, noProjectionAliases: true }));
+        let orderLimitOffset  = this.generateSelectOrderLimitOffset(queryEngine, this.stackAssign(options, { forceLimit: 4294967294 }));
         let escapedColumnName = this.getEscapedColumnName(Model, pkField, options);
 
-        return `DELETE FROM ${escapedTableName} WHERE ${escapedColumnName} IN (${innerSelect})`;
+        return `DELETE FROM ${escapedTableName} WHERE ${escapedColumnName} IN (${innerSelect})${(orderLimitOffset) ? ` ${orderLimitOffset}` : ''}`;
       } else {
         return `DELETE FROM ${escapedTableName}${(where) ? ` ${where}` : ''}`;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.5.2"
+    "mythix-orm": "^1.5.5"
   },
   "dependencies": {
     "nife": "^1.11.3",