@mikro-orm/core 6.5.7-dev.17 → 6.5.7-dev.18

package/package.json

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

package/utils/TransactionManager.js

@@ -6,6 +6,7 @@ const events_1 = require("../events");
 const TransactionContext_1 = require("../utils/TransactionContext");
 const unit_of_work_1 = require("../unit-of-work");
 const errors_1 = require("../errors");
+const wrap_1 = require("../entity/wrap");
 /**
  * Manages transaction lifecycle and propagation for EntityManager.
  */
@@ -152,6 +153,14 @@ class TransactionManager {
      * Merges entities from fork to parent EntityManager.
      */
     mergeEntitiesToParent(fork, parent) {
+        // perf: if parent is empty, we can just move all entities from the fork to skill the `em.merge` overhead
+        if (parent.getUnitOfWork(false).getIdentityMap().keys().length === 0) {
+            for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
+                parent.getUnitOfWork(false).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 });
         }