mythix-orm - npm Package Compare versions

Comparing version 1.7.0 to 1.7.1

lib/connection/connection-base.js

@@ -903,3 +903,3 @@ 'use strict';
             let batchModel = batchModels[i];
-            batchModel.clearDirty();
+            // batchModel.clearDirty();
             finalResults.push(batchModel);
@@ -926,2 +926,3 @@ }
     let allDirtyModels    = new Set();
+    let allStoredModels   = new Set();
     let primaryResult;
@@ -946,2 +947,4 @@
       for (let storedModel of results) {
+        allStoredModels.add(storedModel);
+
         for (let [ groupModelName, groupModels ] of groupedModelMap) {
@@ -959,5 +962,4 @@ if (groupModelName === modelName)
           for (let targetModel of groupModels) {
-            Utils.setRelationalValues(this, TargetModel, targetModel, GroupModel, storedModel);
-
-            if (targetModel.isDirty())
+            let hasChanges = Utils.setRelationalValues(this, TargetModel, targetModel, GroupModel, storedModel);
+            if (hasChanges)
               allDirtyModels.add(targetModel);
@@ -975,2 +977,8 @@ }
 
+    // Now mark all models as clean and persisted
+    for (let storedModel of allStoredModels) {
+      storedModel.clearDirty();
+      storedModel._persisted = true;
+    }
+
     return (inputIsArray || !primaryResult) ? primaryResult : primaryResult[0];
@@ -977,0 +985,0 @@ }

lib/utils/model-utils.d.ts

@@ -21,3 +21,3 @@ import ConnectionBase from '../connection/connection-base';
 export declare interface ModelsRelationStatuses {
-  [ key: string ]: RelationStatus
+  [key: string]: RelationStatus
 }
@@ -74,3 +74,3 @@
   sourceModelInstance: Model,
-): T;
+): boolean;
 
@@ -86,3 +86,3 @@ export declare function assignRelatedModels(model: Model, relatedModels: Model | Array<Model>): void;
   },
-): Array<any> | { [ key: string ]: Array<any> };
+): Array<any> | { [key: string]: Array<any> };
 
@@ -89,0 +89,0 @@ export declare function buildQueryFromModelsAttributes(

lib/utils/model-utils.js

@@ -534,5 +534,6 @@ 'use strict';
   if (targetModelName === sourceModelName)
-    return targetModelInstance;
+    return false;
 
-  let fieldSets = TargetModel.getForeignKeysTargetFieldNames(connection, sourceModelName);
+  let fieldSets   = TargetModel.getForeignKeysTargetFieldNames(connection, sourceModelName);
+  let hasChanges  = false;
 
@@ -552,6 +553,9 @@ // Update fields to related model
 
-    targetModelInstance[targetFieldName] = sourceModelValue;
+    if (targetModelInstance[targetFieldName] !== sourceModelValue) {
+      targetModelInstance[targetFieldName] = sourceModelValue;
+      hasChanges = true;
+    }
   }
 
-  return targetModelInstance;
+  return hasChanges;
 }
@@ -558,0 +562,0 @@

package.json

 {
   "name": "mythix-orm",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "ORM for Mythix framework",
@@ -5,0 +5,0 @@ "main": "lib/index",

No alert changes

Improved metrics

Total package byte prevSize

474456

increased by0.08%

Lines of code

12017

increased by0.09%

No dependency changes