@mikro-orm/core 6.6.15-dev.0 → 6.6.15-dev.2

package/EntityManager.js

@@ -735,7 +735,7 @@ class EntityManager {
                 }
             }
             const data2 = await this.driver.findOne(meta.className, where, {
-                fields: returning,
+                fields: returning.concat(...(options.onConflictMergeFields ?? [])),
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
@@ -883,10 +883,11 @@ 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)
         const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(allWhere[0]) ? Object.keys(allWhere[0]).flatMap(key => utils_1.Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
         const returning = (0, utils_1.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 ? [unique[propIndex]] : []);
@@ -903,7 +904,7 @@ class EntityManager {
                 });
             }
             const data2 = await this.driver.find(meta.className, where, {
-                fields: returning.concat(...add).concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
+                fields: returning.concat(...add).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": "6.6.15-dev.0",
+  "version": "6.6.15-dev.2",
   "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.3.3",
     "globby": "11.1.0",
-    "mikro-orm": "6.6.15-dev.0",
+    "mikro-orm": "6.6.15-dev.2",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/QueryHelper.js

@@ -47,7 +47,8 @@ class QueryHelper {
         }
         const keys = Object.keys(where);
         const groupOperator = keys.find(k => {
-            return Utils_1.Utils.isGroupOperator(k) && Array.isArray(where[k]) && where[k].every(cond => {
+            // sole-key only: caller drops the parent, so siblings would be silently lost
+            return keys.length === 1 && Utils_1.Utils.isGroupOperator(k) && Array.isArray(where[k]) && where[k].every(cond => {
                 return Utils_1.Utils.isPlainObject(cond) && Object.keys(cond).every(k2 => {
                     if (Utils_1.Utils.isOperator(k2, false)) {
                         if (k2 === '$not') {