mythix-orm-sql-base 1.3.1 → 1.4.0

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

@@ -70,10 +70,6 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     return `${modelName}:${fieldName}`;
   };
 
-  isFieldProjection(str) {
-    return (/^"[^"]+"."[^"]+"|"\w+:[\w.]+"/i).test(str);
-  }
-
   parseFieldProjectionToFieldMap(selectStatement) {
     let firstPart           = selectStatement.replace(/[\r\n]/g, ' ').split(/\s+FROM\s+/i)[0].replace(/^SELECT\s+/i, '').trim();
     let fieldParts          = firstPart.split(',');
@@ -89,7 +85,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
         projectionFieldMap.set(field, field);
 
       // If this isn't a field, then add it
-      if (!this.isFieldProjection(fieldPart))
+      if (!this.isFieldIdentifier(fieldPart))
         projectionFieldMap.set(fieldPart, fieldPart);
     }
 
@@ -313,7 +309,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     let modelNames = Array.from(joins.keys());
 
     return Utils.sortModelNamesByDependencyOrder(this.connection, modelNames, (Model, modelName) => {
-      let joinInfos     = joins.get(modelName);
+      let joinInfos     = joins.get(modelName) || [];
       let dependencies  = [];
 
       for (let i = 0, il = joinInfos.length; i < il; i++) {
@@ -454,6 +450,11 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     return sqlParts.join(' ');
   }
 
+  // eslint-disable-next-line no-unused-vars
+  allowOrderFieldWhenNotProjected(orderField, options) {
+    return true;
+  }
+
   // eslint-disable-next-line no-unused-vars
   generateOrderClause(_orders, _options) {
     if (LiteralBase.isLiteral(_orders))
@@ -479,7 +480,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
         let fieldName   = orderField.Field.fieldName;
         let fqFieldName = `${modelName}:${fieldName}`;
 
-        if (!options.projectionFields.has(fqFieldName))
+        if (!options.projectionFields.has(fqFieldName) && !this.allowOrderFieldWhenNotProjected(orderField, options))
           continue;
       }
 
@@ -1055,6 +1056,8 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
         queryEngine = Utils.buildQueryFromModelsAttributes(Model, models);
         if (!queryEngine)
           throw new Error(`${this.constructor.name}::generateDeleteStatement: Data provided for "${Model.getModelName()}" model is insufficient to complete operation.`);
+      } else {
+        queryEngine = queryEngine.clone();
       }
     }
 
@@ -1065,9 +1068,9 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
       if (where && pkField) {
         if (pkField)
-          queryEngine = queryEngine.clone().PROJECT(`${Model.getModelName()}:${pkField.fieldName}`);
+          queryEngine = queryEngine.PROJECT(`${Model.getModelName()}:${pkField.fieldName}`);
 
-        let innerSelect       = this.generateSelectStatement(queryEngine, this.stackAssign(options, { noProjectionAliases: true }));
+        let innerSelect       = this.generateSelectStatement(queryEngine, this.stackAssign(options, { isSubQuery: true, noProjectionAliases: true }));
         let escapedColumnName = this.getEscapedColumnName(Model, pkField, options);
 
         return `DELETE FROM ${escapedTableName} WHERE ${escapedColumnName} IN (${innerSelect})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "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.4.5"
+    "mythix-orm": "^1.5.0"
   },
   "dependencies": {
     "nife": "^1.11.3",