mythix-orm-sql-base 1.7.2 → 1.7.4

package/lib/sql-connection-base.js

@@ -85,6 +85,16 @@ class SQLConnectionBase extends ConnectionBase {
       return (!parts.length) ? null : parts.join(',');
     };
 
+    const isEmptyModel = (model) => {
+      if (!model)
+        return true;
+
+      if (model._mythixIsEmpty === false)
+        return false;
+
+      return true;
+    };
+
     let context         = queryEngine._getRawQueryContext();
     let fields          = this.findAllFieldsFromFieldProjectionMap(columns);
     let rootModelName   = context.rootModelName;
@@ -140,16 +150,31 @@ class SQLConnectionBase extends ConnectionBase {
         if (!dataContext)
           dataContext = data[modelName] = {};
 
+        // Track empty models (can happen for left or right table joins)
+        if (remoteValue != null && !Object.prototype.hasOwnProperty.call(dataContext, '_mythixIsEmpty')) {
+          Object.defineProperties(dataContext, {
+            '_mythixIsEmpty': {
+              writable:     true,
+              enumerable:   false,
+              configurable: true,
+              value:        false,
+            },
+          });
+        }
+
         dataContext[field.fieldName] = remoteValue;
       }
 
       let rootModel;
       for (let j = 0, jl = modelNames.length; j < jl; j++) {
-        let modelName     = modelNames[j];
-        let info          = modelInfo[modelName];
-        let models        = modelData[modelName];
-        let model         = data[modelName];
-        let pkFieldName   = info.pkFieldName;
+        let modelName = modelNames[j];
+        let model     = data[modelName];
+        if (isEmptyModel(model))
+          continue;
+
+        let info        = modelInfo[modelName];
+        let models      = modelData[modelName];
+        let pkFieldName = info.pkFieldName;
         let index;
 
         if (!models)
@@ -413,6 +438,9 @@ class SQLConnectionBase extends ConnectionBase {
 
     let options = _options || {};
     if (_models == null) {
+      if (options.truncate !== true)
+        return;
+
       let queryGenerator  = this.getQueryGenerator();
       let sqlStr          = queryGenerator.generateDeleteStatement(Model, Model.where(this).unscoped(), options);
 
@@ -742,7 +770,7 @@ class SQLConnectionBase extends ConnectionBase {
 
   async alterColumn(Field, newFieldAttributes, options) {
     let queryGenerator  = this.getQueryGenerator();
-    let sqlStatements   = queryGenerator.generateAlterColumnStatement(Field, newFieldAttributes, options);
+    let sqlStatements   = queryGenerator.generateAlterColumnStatements(Field, newFieldAttributes, options);
 
     for (let i = 0, il = sqlStatements.length; i < il; i++) {
       let sqlStr = sqlStatements[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index",
   "type": "commonjs",
@@ -33,18 +33,18 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.8.2"
+    "mythix-orm": "^1.8.3"
   },
   "dependencies": {
-    "luxon": "^3.0.4",
+    "luxon": "^3.1.0",
     "nife": "^1.12.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
     "better-sqlite3": "^7.6.2",
-    "eslint": "^8.23.1",
-    "jasmine": "^4.4.0",
+    "eslint": "^8.27.0",
+    "jasmine": "^4.5.0",
     "nyc": "^15.1.0"
   },
   "nyc": {