@mikro-orm/core 7.1.2-dev.11 → 7.1.2-dev.13

package/package.json

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

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

package/utils/upsert-utils.js

@@ -86,7 +86,10 @@ export function getOnConflictReturningFields(meta, data, uniqueFields, options)
         if (p.autoincrement) {
             return true;
         }
-        return Array.isArray(uniqueFields) && !uniqueFields.includes(p.name);
+        // for a raw `onConflictFields` fragment we can't introspect which columns form the conflict
+        // target, so we keep every comparable prop (returning the unique key columns is harmless) –
+        // otherwise the non-merged columns would never be reloaded and the entity would diverge from db
+        return !Array.isArray(uniqueFields) || !uniqueFields.includes(p.name);
     })
         .map(p => p.name);
     if (meta.versionProperty) {