@mikro-orm/core 6.5.7-dev.22 → 6.5.7-dev.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.5.7-dev.22",
+  "version": "6.5.7-dev.23",
   "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.2",
     "globby": "11.1.0",
-    "mikro-orm": "6.5.7-dev.22",
+    "mikro-orm": "6.5.7-dev.23",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/TransactionManager.js

@@ -153,22 +153,28 @@ class TransactionManager {
      * Merges entities from fork to parent EntityManager.
      */
     mergeEntitiesToParent(fork, parent) {
+        const parentUoW = parent.getUnitOfWork(false);
         // perf: if parent is empty, we can just move all entities from the fork to skip the `em.merge` overhead
-        if (parent.getUnitOfWork(false).getIdentityMap().keys().length === 0) {
+        if (parentUoW.getIdentityMap().keys().length === 0) {
             for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
-                parent.getUnitOfWork(false).getIdentityMap().store(entity);
+                parentUoW.getIdentityMap().store(entity);
                 (0, wrap_1.helper)(entity).__em = parent;
             }
             return;
         }
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
-            parent.merge(entity, {
-                disableContextResolution: true,
-                keepIdentity: true,
-                refresh: true,
-                validate: false,
-                cascade: false,
-            });
+            const wrapped = (0, wrap_1.helper)(entity);
+            const meta = wrapped.__meta;
+            // eslint-disable-next-line dot-notation
+            const parentEntity = parentUoW.getById(meta.className, wrapped.getPrimaryKey(), parent['_schema'], true);
+            if (parentEntity && parentEntity !== entity) {
+                const parentWrapped = (0, wrap_1.helper)(parentEntity);
+                parentWrapped.__data = (0, wrap_1.helper)(entity).__data;
+                parentWrapped.__originalEntityData = (0, wrap_1.helper)(entity).__originalEntityData;
+            }
+            else {
+                parentUoW.merge(entity, new Set([entity]));
+            }
         }
     }
     /**