@mikro-orm/core 7.2.2-dev.2 → 7.2.2-dev.3

package/EntityManager.js

@@ -995,6 +995,9 @@ export class EntityManager {
         const uniqueFields = options.onConflictFields ??
             (Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = getOnConflictReturningFields(meta, data, uniqueFields, options);
+        if (options.onConflictWhere && !ret.row) {
+            returning.push(...Object.keys(data));
+        }
         if (options.onConflictAction === 'ignore' ||
             !helper(entity).hasPrimaryKey() ||
             (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
@@ -1183,9 +1186,9 @@ export class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
-            em.#unitOfWork
-                .getChangeSetPersister()
-                .mapReturnedValues(Utils.isEntity(data[i]) ? data[i] : null, Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
+            em.#unitOfWork.getChangeSetPersister().mapReturnedValues(Utils.isEntity(data[i]) ? data[i] : null, Utils.isEntity(data[i]) ? {} : data[i], 
+            // A suppressed conflict omits its row; positional mapping would hydrate a different entity.
+            res.rows?.length === allData.length ? res.rows[i] : undefined, meta, true);
             const entity = Utils.isEntity(data[i])
                 ? data[i]
                 : em.#entityFactory.create(entityName, row, {
@@ -1204,6 +1207,9 @@ export class EntityManager {
         // oxfmt-ignore
         const uniqueFields = options.onConflictFields ?? (Utils.isPlainObject(allWhere[0]) ? Object.keys(allWhere[0]).flatMap(key => Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
         const returning = getOnConflictReturningFields(meta, data[0], uniqueFields, options);
+        if (options.onConflictWhere && res.rows?.length !== allData.length) {
+            returning.push(...meta.comparableProps.filter(p => !p.lazy && !p.embeddable).map(p => p.name));
+        }
         const reloadFields = returning.length > 0 && !(this.getPlatform().usesReturningStatement() && res.rows?.length === data.length);
         if (options.onConflictAction === 'ignore' || (!res.rows?.length && loadPK.size > 0) || reloadFields) {
             const unique = meta.hydrateProps.filter(p => !p.lazy).map(p => p.name);
@@ -1235,8 +1241,9 @@ export class EntityManager {
                 const row = data2.find(row => {
                     const tmp = {};
                     add.forEach(k => {
-                        if (!meta.properties[k]?.primary) {
-                            tmp[k] = row[k];
+                        const prop = meta.properties[k];
+                        if (!prop?.primary) {
+                            tmp[k] = prop?.customType ? prop.customType.convertToDatabaseValue(row[k], this.getPlatform()) : row[k];
                         }
                     });
                     return this.#comparator.matching(entityName, cond, tmp);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.2-dev.2",
+  "version": "7.2.2-dev.3",
   "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.",
   "keywords": [
     "data-mapper",

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.2-dev.2';
+    static #ORM_VERSION = '7.2.2-dev.3';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;