@mikro-orm/core 6.3.14-dev.44 → 6.3.14-dev.46

package/EntityManager.js

@@ -623,7 +623,7 @@ class EntityManager {
         const convertCustomTypes = !utils_1.Utils.isEntity(data);
         if (utils_1.Utils.isEntity(data)) {
             entity = data;
-            if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em) {
+            if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em && !this.config.get('upsertManaged')) {
                 em.entityFactory.mergeData(meta, entity, data, { initialized: true });
                 return entity;
             }
@@ -633,7 +633,7 @@ class EntityManager {
         else {
             data = utils_1.Utils.copy(utils_1.QueryHelper.processParams(data));
             where = utils_1.Utils.extractPK(data, meta);
-            if (where) {
+            if (where && !this.config.get('upsertManaged')) {
                 const exists = em.unitOfWork.getById(entityName, where, options.schema);
                 if (exists) {
                     return em.assign(exists, data);
@@ -763,7 +763,7 @@ class EntityManager {
             let where;
             if (utils_1.Utils.isEntity(row)) {
                 const entity = row;
-                if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em) {
+                if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em && !this.config.get('upsertManaged')) {
                     em.entityFactory.mergeData(meta, entity, row, { initialized: true });
                     entities.set(entity, row);
                     entitiesByData.set(row, entity);
@@ -775,7 +775,7 @@ class EntityManager {
             else {
                 row = data[i] = utils_1.Utils.copy(utils_1.QueryHelper.processParams(row));
                 where = utils_1.Utils.extractPK(row, meta);
-                if (where) {
+                if (where && !this.config.get('upsertManaged')) {
                     const exists = em.unitOfWork.getById(entityName, where, options.schema);
                     if (exists) {
                         em.assign(exists, row);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.44",
+  "version": "6.3.14-dev.46",
   "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.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.44",
+    "mikro-orm": "6.3.14-dev.46",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/Configuration.d.ts

@@ -71,6 +71,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             mergeEmbeddedProperties: true;
         };
         persistOnCreate: true;
+        upsertManaged: true;
         forceEntityConstructor: false;
         forceUndefined: false;
         ensureDatabase: true;
@@ -333,6 +334,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     };
     assign: AssignOptions<boolean>;
     persistOnCreate: boolean;
+    upsertManaged: boolean;
     forceEntityConstructor: boolean | (Constructor<AnyEntity> | string)[];
     forceUndefined: boolean;
     forceUtcTimezone?: boolean;

package/utils/Configuration.js

@@ -65,6 +65,7 @@ class Configuration {
             mergeEmbeddedProperties: true,
         },
         persistOnCreate: true,
+        upsertManaged: true,
         forceEntityConstructor: false,
         forceUndefined: false,
         ensureDatabase: true,