@mikro-orm/core 7.1.1-dev.1 → 7.1.1-dev.11

package/EntityManager.js

@@ -863,7 +863,7 @@ export class EntityManager {
                 }
             }
             const data2 = await this.driver.findOne(meta.class, where, {
-                fields: returning,
+                fields: returning.concat(...(options.onConflictMergeFields ?? [])),
                 ctx: em.#transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
@@ -1031,11 +1031,12 @@ export class EntityManager {
             entities.set(entity, row);
             entitiesByData.set(row, entity);
         });
-        // skip if we got the PKs via returning statement (`rows`)
+        // skip the reload only when RETURNING brought back a row for every input
+        // (onConflictWhere can suppress writes, leaving some rows out)
         // 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);
-        const reloadFields = returning.length > 0 && !(this.getPlatform().usesReturningStatement() && res.rows?.length);
+        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);
             const add = new Set(propIndex !== false && propIndex >= 0
@@ -1055,7 +1056,8 @@ export class EntityManager {
             const data2 = await this.driver.find(meta.class, where, {
                 fields: returning
                     .concat(...add)
-                    .concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
+                    .concat(...(Array.isArray(uniqueFields) ? uniqueFields : []))
+                    .concat(...(options.onConflictMergeFields ?? [])),
                 ctx: em.#transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.1-dev.1",
+  "version": "7.1.1-dev.11",
   "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/QueryHelper.js

@@ -145,8 +145,19 @@ export class QueryHelper {
                     })));
         }
         Object.keys(where).forEach(k => {
-            const meta2 = metadata.find(meta.properties[k]?.targetMeta?.class) || meta;
+            const prop = meta.properties[k];
+            const meta2 = metadata.find(prop?.targetMeta?.class) || meta;
             if (this.inlinePrimaryKeyObjects(where[k], meta2, metadata, k)) {
+                // Skip the PK collapse when an owning M:1/1:1 relation's FK column count does not match
+                // the target's PK column count (e.g. FK references target PK + an extra unique column).
+                // The criteria layer would otherwise emit a malformed predicate such as
+                // `(joinCol1, joinCol2) = scalar`. Limited to owning relations — `joinColumns` on the
+                // inverse side (1:m) describes the owning entity's FK columns, not the LHS tuple.
+                if (prop?.owner &&
+                    [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                    prop.joinColumns.length !== meta2.primaryKeys.length) {
+                    return;
+                }
                 where[k] = Utils.getPrimaryKeyValues(where[k], meta2, true);
             }
         });

package/utils/Utils.js

@@ -141,7 +141,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.1.1-dev.1';
+    static #ORM_VERSION = '7.1.1-dev.11';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */