@mikro-orm/core 7.2.4-dev.12 → 7.2.4-dev.14

package/EntityManager.js

@@ -1248,7 +1248,10 @@ export class EntityManager {
         // 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 getUniqueFields = (where) => options.onConflictFields ?? (Utils.isPlainObject(where) ? Object.keys(where).flatMap(key => Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
+        const uniqueFields = getUniqueFields(allWhere[0]);
+        // an empty condition identifies no row, it must not turn into a reload condition matching every row
+        const getRowUniqueFields = (where) => Utils.isPlainObject(where) && !Utils.hasObjectKeys(where) ? uniqueFields : getUniqueFields(where);
         const platform = this.getPlatform();
         const returning = getOnConflictReturningFields(meta, data[dataIndexes[0]], uniqueFields, options, platform);
         if (options.onConflictWhere && res.rows?.length !== allData.length) {
@@ -1268,7 +1271,9 @@ export class EntityManager {
             dataIndexes.forEach((index, idx) => {
                 const item = data[index];
                 where.$or[idx] = {};
-                const props = Array.isArray(uniqueFields) ? uniqueFields : Object.keys(item);
+                // the inputs of one batch can be identified by different unique keys
+                const fields = getRowUniqueFields(allWhere[idx]);
+                const props = Array.isArray(fields) ? fields : Object.keys(item);
                 props.forEach(prop => {
                     where.$or[idx][prop] = item[prop];
                 });
@@ -1294,7 +1299,10 @@ export class EntityManager {
                     });
                     return tmp;
                 });
-                const isMatch = (cond, idx) => this.#comparator.matching(entityName, cond, comparableRows[idx]);
+                // rows carry the keys of every condition in the batch, compare only this one's (an empty one must not match)
+                const isMatch = (cond, idx) => this.#comparator.matching(entityName, cond, Utils.hasObjectKeys(cond)
+                    ? Object.fromEntries(Object.entries(comparableRows[idx]).filter(([k]) => k in cond))
+                    : comparableRows[idx]);
                 // When every condition key is a comparable prop checked with `!==`, a matching row has the same primitive
                 // values, so rows can be grouped by those values once instead of comparing every row for every entity.
                 // Props outside `comparableProps` are skipped by the comparator, so they never qualify for grouping.
@@ -1333,14 +1341,15 @@ export class EntityManager {
             if (loadPK.size !== data2.length && Array.isArray(uniqueFields)) {
                 for (let i = 0; i < allData.length; i++) {
                     const data = allData[i];
-                    const cond = uniqueFields.reduce((a, b) => {
+                    const fields = getRowUniqueFields(allWhere[i]);
+                    const cond = fields.reduce((a, b) => {
                         // @ts-ignore
                         a[b] = data[b];
                         return a;
                     }, {});
                     const entity = entitiesByData.get(data);
                     const row = data2.find(item => {
-                        const pk = uniqueFields.reduce((a, b) => {
+                        const pk = fields.reduce((a, b) => {
                             // @ts-ignore
                             a[b] = item[b];
                             return a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.4-dev.12",
+  "version": "7.2.4-dev.14",
   "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.4-dev.12';
+    static #ORM_VERSION = '7.2.4-dev.14';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;