mythix-orm 1.7.0 → 1.7.1

package/lib/connection/connection-base.js

@@ -900,7 +900,7 @@ class ConnectionBase extends EventEmitter {
         if (batchModels) {
           for (let i = 0, il = batchModels.length; i < il; i++) {
             let batchModel = batchModels[i];
-            batchModel.clearDirty();
+            // batchModel.clearDirty();
             finalResults.push(batchModel);
           }
         }
@@ -922,6 +922,7 @@ class ConnectionBase extends EventEmitter {
     let groupedModelMap   = this.prepareAllModelsAndSubModelsForOperation(Model, models, options);
     let alreadyStored     = {};
     let allDirtyModels    = new Set();
+    let allStoredModels   = new Set();
     let primaryResult;
 
     for (let [ modelName, models ] of groupedModelMap) {
@@ -941,6 +942,8 @@ class ConnectionBase extends EventEmitter {
         primaryResult = results;
 
       for (let storedModel of results) {
+        allStoredModels.add(storedModel);
+
         for (let [ groupModelName, groupModels ] of groupedModelMap) {
           if (groupModelName === modelName)
             continue;
@@ -953,9 +956,8 @@ class ConnectionBase extends EventEmitter {
             continue;
 
           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);
           }
         }
@@ -968,6 +970,12 @@ class ConnectionBase extends EventEmitter {
     if (allDirtyModels.size > 0 && typeof afterOperationCallback === 'function')
       await afterOperationCallback.call(this, Model, allDirtyModels, options, queryGenerator);
 
+    // Now mark all models as clean and persisted
+    for (let storedModel of allStoredModels) {
+      storedModel.clearDirty();
+      storedModel._persisted = true;
+    }
+
     return (inputIsArray || !primaryResult) ? primaryResult : primaryResult[0];
   }
 

package/lib/utils/model-utils.d.ts

@@ -18,7 +18,7 @@ export declare interface RelationStatus {
 }
 
 export declare interface ModelsRelationStatuses {
-  [ key: string ]: RelationStatus
+  [key: string]: RelationStatus
 }
 
 export declare function isUUID(value: any): boolean;
@@ -70,7 +70,7 @@ export declare function setRelationalValues<T extends Model = Model>(
   targetModelInstance: T,
   SourceModel: ModelClass,
   sourceModelInstance: Model,
-): T;
+): boolean;
 
 export declare function assignRelatedModels(model: Model, relatedModels: Model | Array<Model>): void;
 export declare function getPrimaryKeysForModels(
@@ -81,7 +81,7 @@ export declare function getPrimaryKeysForModels(
     includeRelations?: boolean | Array<string>,
     skipRelations?: Array<string>,
   },
-): Array<any> | { [ key: string ]: Array<any> };
+): Array<any> | { [key: string]: Array<any> };
 
 export declare function buildQueryFromModelsAttributes(
   connection: ConnectionBase,

package/lib/utils/model-utils.js

@@ -531,9 +531,10 @@ function setRelationalValues(connection, TargetModel, targetModelInstance, Sourc
   let sourceModelName   = SourceModel.getModelName();
 
   if (targetModelName === sourceModelName)
-    return targetModelInstance;
+    return false;
 
-  let fieldSets = TargetModel.getForeignKeysTargetFieldNames(connection, sourceModelName);
+  let fieldSets   = TargetModel.getForeignKeysTargetFieldNames(connection, sourceModelName);
+  let hasChanges  = false;
 
   // Update fields to related model
   for (let i = 0, il = fieldSets.length; i < il; i++) {
@@ -548,10 +549,13 @@ function setRelationalValues(connection, TargetModel, targetModelInstance, Sourc
     let sourceFieldName   = fieldSet.targetFieldName;
     let sourceModelValue  = (sourceModelInstance) ? sourceModelInstance[sourceFieldName] : null;
 
-    targetModelInstance[targetFieldName] = sourceModelValue;
+    if (targetModelInstance[targetFieldName] !== sourceModelValue) {
+      targetModelInstance[targetFieldName] = sourceModelValue;
+      hasChanges = true;
+    }
   }
 
-  return targetModelInstance;
+  return hasChanges;
 }
 
 function assignRelatedModels(model, _relatedModels) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "ORM for Mythix framework",
   "main": "lib/index",
   "type": "commonjs",