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

package/EntityManager.js

@@ -1188,7 +1188,9 @@ class EntityManager {
         options.schema ??= em._schema;
         options.validate ??= true;
         entityName = utils_1.Utils.className(entityName);
-        em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        if (options.validate) {
+            em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        }
         let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && (0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__initialized && !options.refresh) {
             return entity;
@@ -1197,7 +1199,8 @@ class EntityManager {
         const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
         const dataIsEntity = utils_1.Utils.isEntity(data);
         if (options.keepIdentity && entity && dataIsEntity && entity !== data) {
-            em.entityFactory.mergeData(meta, entity, (0, entity_1.helper)(data).__originalEntityData, { initialized: true, merge: true, ...options });
+            (0, entity_1.helper)(entity).__data = (0, entity_1.helper)(data).__data;
+            (0, entity_1.helper)(entity).__originalEntityData = (0, entity_1.helper)(data).__originalEntityData;
             return entity;
         }
         entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });

package/package.json

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