@mikro-orm/core 6.4.17-dev.26 → 6.4.17-dev.28

package/EntityManager.js

@@ -488,11 +488,17 @@ class EntityManager {
             ...options,
             flushMode: enums_1.FlushMode.COMMIT,
         });
+        const em = this.getContext();
         if (reloaded) {
-            this.config.getHydrator(this.metadata).hydrate(entity, (0, entity_1.helper)(entity).__meta, (0, entity_1.helper)(reloaded).toPOJO(), this.getEntityFactory(), 'full', false, true);
+            for (const e of fork.unitOfWork.getIdentityMap()) {
+                const ref = em.getReference(e.constructor.name, (0, entity_1.helper)(e).getPrimaryKey());
+                const data = this.comparator.prepareEntity(e);
+                em.config.getHydrator(this.metadata).hydrate(ref, (0, entity_1.helper)(ref).__meta, (0, entity_1.helper)(e).toPOJO(), em.entityFactory, 'full', false, true);
+                (0, entity_1.helper)(ref).__originalEntityData = data;
+            }
         }
         else {
-            this.getUnitOfWork().unsetIdentity(entity);
+            em.unitOfWork.unsetIdentity(entity);
         }
         return reloaded ? entity : reloaded;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.17-dev.26",
+  "version": "6.4.17-dev.28",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.17-dev.26",
+    "mikro-orm": "6.4.17-dev.28",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/EntityComparator.js

@@ -534,9 +534,12 @@ class EntityComparator {
         context.set('compareBuffers', Utils_1.compareBuffers);
         context.set('compareObjects', Utils_1.compareObjects);
         context.set('equals', Utils_1.equals);
-        meta.comparableProps.forEach(prop => {
-            lines.push(this.getPropertyComparator(prop, context));
-        });
+        for (const prop of meta.comparableProps) {
+            // skip properties that are not hydrated
+            if (prop.hydrate !== false) {
+                lines.push(this.getPropertyComparator(prop, context));
+            }
+        }
         const code = `// compiled comparator for entity ${meta.className}\n`
             + `return function(last, current) {\n  const diff = {};\n${lines.join('\n')}\n  return diff;\n}`;
         const comparator = Utils_1.Utils.createFunction(context, code);