@mikro-orm/core 6.2.10-dev.59 → 6.2.10-dev.60

package/EntityManager.js

@@ -650,11 +650,6 @@ class EntityManager {
                 }
             }
         }
-        if (where == null) {
-            const compositeUniqueProps = meta.uniques.map(u => utils_1.Utils.asArray(u.properties).join(' + '));
-            const uniqueProps = meta.primaryKeys.concat(...unique).concat(compositeUniqueProps);
-            throw new Error(`Unique property value required for upsert, provide one of: ${uniqueProps.join(', ')}`);
-        }
         data = utils_1.QueryHelper.processObjectParams(data);
         em.validator.validateParams(data, 'insert data');
         if (em.eventManager.hasListeners(enums_1.EventType.beforeUpsert, meta)) {
@@ -672,13 +667,20 @@ class EntityManager {
             schema: options.schema,
             convertCustomTypes: true,
         });
-        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta);
+        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
         const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = (0, utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
         if (options.onConflictAction === 'ignore' || !(0, entity_1.helper)(entity).hasPrimaryKey() || (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
             const where = {};
             if (Array.isArray(uniqueFields)) {
-                uniqueFields.forEach(prop => where[prop] = data[prop]);
+                for (const prop of uniqueFields) {
+                    if (data[prop] != null) {
+                        where[prop] = data[prop];
+                    }
+                    else if (meta.primaryKeys.includes(prop) && ret.insertId != null) {
+                        where[prop] = ret.insertId;
+                    }
+                }
             }
             const data2 = await this.driver.findOne(meta.className, where, {
                 fields: returning,
@@ -793,11 +795,6 @@ class EntityManager {
                     }
                 }
             }
-            if (where == null) {
-                const compositeUniqueProps = meta.uniques.map(u => utils_1.Utils.asArray(u.properties).join(' + '));
-                const uniqueProps = meta.primaryKeys.concat(...unique).concat(compositeUniqueProps);
-                throw new Error(`Unique property value required for upsert, provide one of: ${uniqueProps.join(', ')}`);
-            }
             row = utils_1.QueryHelper.processObjectParams(row);
             where = utils_1.QueryHelper.processWhere({
                 where,
@@ -834,7 +831,7 @@ class EntityManager {
                 schema: options.schema,
                 convertCustomTypes: true,
             });
-            em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta);
+            em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
             if (!(0, entity_1.helper)(entity).hasPrimaryKey()) {
                 loadPK.set(entity, allWhere[i]);
             }

package/package.json

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

package/unit-of-work/ChangeSetPersister.d.ts

@@ -47,5 +47,5 @@ export declare class ChangeSetPersister {
      * No need to handle composite keys here as they need to be set upfront.
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
-    mapReturnedValues<T extends object>(entity: T, payload: EntityDictionary<T>, row: Dictionary | undefined, meta: EntityMetadata<T>): void;
+    mapReturnedValues<T extends object>(entity: T, payload: EntityDictionary<T>, row: Dictionary | undefined, meta: EntityMetadata<T>, upsert?: boolean): void;
 }

package/unit-of-work/ChangeSetPersister.js

@@ -351,8 +351,8 @@ class ChangeSetPersister {
      * No need to handle composite keys here as they need to be set upfront.
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
-    mapReturnedValues(entity, payload, row, meta) {
-        if (this.usesReturningStatement && row && utils_1.Utils.hasObjectKeys(row)) {
+    mapReturnedValues(entity, payload, row, meta, upsert = false) {
+        if ((this.usesReturningStatement || upsert) && row && utils_1.Utils.hasObjectKeys(row)) {
             const mapped = this.comparator.mapResult(meta.className, row);
             this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
             Object.assign(payload, mapped); // merge to the changeset payload, so it gets saved to the entity snapshot