@mikro-orm/core 7.1.2-dev.9 → 7.1.3-dev.0

package/metadata/MetadataDiscovery.js

@@ -1379,15 +1379,17 @@ export class MetadataDiscovery {
             }
             // When multiple STI children share the same unique relation (OneToOne/ManyToOne),
             // replace the simple unique with a composite one including the discriminator column
-            // so different subtypes can independently reference the same target row.
-            if (rootProp?.unique &&
-                newProp.unique &&
-                [ReferenceKind.ONE_TO_ONE, ReferenceKind.MANY_TO_ONE].includes(newProp.kind)) {
+            // so different subtypes can independently reference the same target row. The second
+            // child already cleared `rootProp.unique`, so for 3+ children we key on the shared
+            // root property existing rather than its (now false) flag, and dedupe the composite.
+            if (rootProp && newProp.unique && [ReferenceKind.ONE_TO_ONE, ReferenceKind.MANY_TO_ONE].includes(newProp.kind)) {
                 newProp.unique = false;
                 rootProp.unique = false;
-                meta.root.uniques.push({
-                    properties: [prop.name, meta.root.discriminatorColumn],
-                });
+                const properties = [prop.name, meta.root.discriminatorColumn];
+                const exists = meta.root.uniques.some(u => Utils.equals(Utils.asArray(u.properties), properties));
+                if (!exists) {
+                    meta.root.uniques.push({ properties });
+                }
             }
             newProp.nullable = true;
             newProp.inherited = !rootProp;

package/package.json

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

@@ -167,6 +167,13 @@ export declare abstract class Platform {
         precision?: number;
         scale?: number;
     }): string;
+    /**
+     * Rounds a decimal value to the column's scale and returns it as a number. Used to compare
+     * decimal values across representations — `EntityComparator` for `compareValues`, and the
+     * schema layer for collapsing snapshot defaults like `0` / `0.00` to the same canonical form
+     * so databases that pad to scale (mysql) don't churn no-op migrations.
+     */
+    formatDecimal(value: string | number, scale?: number): number;
     getUuidTypeDeclarationSQL(column: {
         length?: number;
     }): string;
@@ -277,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

@@ -232,6 +232,19 @@ export class Platform {
         const scale = column.scale ?? 0;
         return `numeric(${precision},${scale})`;
     }
+    /**
+     * Rounds a decimal value to the column's scale and returns it as a number. Used to compare
+     * decimal values across representations — `EntityComparator` for `compareValues`, and the
+     * schema layer for collapsing snapshot defaults like `0` / `0.00` to the same canonical form
+     * so databases that pad to scale (mysql) don't churn no-op migrations.
+     */
+    formatDecimal(value, scale) {
+        if (scale == null) {
+            return +value;
+        }
+        const base = Math.pow(10, scale);
+        return Math.round((+value + Number.EPSILON) * base) / base;
+    }
     getUuidTypeDeclarationSQL(column) {
         column.length ??= 36;
         return this.getVarcharTypeDeclarationSQL(column);
@@ -629,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/types/DecimalType.d.ts

@@ -9,7 +9,6 @@ export declare class DecimalType<Mode extends 'number' | 'string' = 'string'> ex
     constructor(mode?: Mode | undefined);
     convertToJSValue(value: string): JSTypeByMode<Mode>;
     compareValues(a: string, b: string): boolean;
-    private format;
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
 }

package/types/DecimalType.js

@@ -16,15 +16,7 @@ export class DecimalType extends Type {
         return String(value);
     }
     compareValues(a, b) {
-        return this.format(a) === this.format(b);
-    }
-    format(val) {
-        /* v8 ignore next */
-        if (this.prop?.scale == null) {
-            return +val;
-        }
-        const base = Math.pow(10, this.prop.scale);
-        return Math.round((+val + Number.EPSILON) * base) / base;
+        return this.platform.formatDecimal(a, this.prop?.scale) === this.platform.formatDecimal(b, this.prop?.scale);
     }
     getColumnType(prop, platform) {
         return platform.getDecimalTypeDeclarationSQL(prop);

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.9';
+    static #ORM_VERSION = '7.1.3-dev.0';
     /**
      * 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) {