@mikro-orm/core 7.1.2-dev.10 → 7.1.2-dev.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.2-dev.10",
+  "version": "7.1.2-dev.12",
   "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/platforms/Platform.d.ts

@@ -284,6 +284,8 @@ export declare abstract class Platform {
     isNumericColumn(mappedType: Type<unknown>): boolean;
     /** Whether the platform supports unsigned integer columns. */
     supportsUnsigned(): boolean;
+    /** Whether the platform persists table/column comments (so they round-trip through introspection). */
+    supportsComments(): boolean;
     /**
      * Maximum length of identifiers (table, column, index, constraint, …) the platform supports.
      * Names produced by {@link getIndexName} above this limit are hash-truncated. Defaults to

package/platforms/Platform.js

@@ -642,6 +642,10 @@ export class Platform {
     supportsUnsigned() {
         return false;
     }
+    /** Whether the platform persists table/column comments (so they round-trip through introspection). */
+    supportsComments() {
+        return true;
+    }
     /**
      * Maximum length of identifiers (table, column, index, constraint, …) the platform supports.
      * Names produced by {@link getIndexName} above this limit are hash-truncated. Defaults to

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.10';
+    static #ORM_VERSION = '7.1.2-dev.12';
     /**
      * 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) {