@mikro-orm/core 7.0.9-dev.1 → 7.0.9-dev.11

package/drivers/DatabaseDriver.js

@@ -310,7 +310,7 @@ export class DatabaseDriver {
             if (prop.joinColumns && Array.isArray(data[k])) {
                 const copy = Utils.flatten(data[k]);
                 delete data[k];
-                prop.joinColumns.forEach((joinColumn, idx) => (data[joinColumn] = copy[idx]));
+                (prop.ownColumns ?? prop.joinColumns).forEach(col => (data[col] = copy[prop.joinColumns.indexOf(col)]));
                 return;
             }
             if (prop.joinColumns?.length > 1 && data[k] == null) {

package/entity/EntityFactory.js

@@ -167,9 +167,11 @@ export class EntityFactory {
             return diff2[key] === undefined;
         })
             .forEach(key => delete diff2[key]);
-        // but always add collection properties and formulas if they are part of the `data`
+        // but always add collection properties, formulas, and generated columns if they are part of the `data`,
+        // as these are excluded from `comparableProps` and won't appear in the diff
         Utils.keys(data)
             .filter(key => meta.properties[key]?.formula ||
+            (meta.properties[key]?.generated && !meta.properties[key]?.primary) ||
             [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
             .forEach(key => (diff2[key] = data[key]));
         // rehydrated with the new values, skip those changed by user

package/metadata/MetadataDiscovery.js

@@ -1267,6 +1267,18 @@ export class MetadataDiscovery {
             if (prop.enum && prop.items && rootProp?.items) {
                 newProp.items = Utils.unique([...rootProp.items, ...prop.items]);
             }
+            // 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)) {
+                newProp.unique = false;
+                rootProp.unique = false;
+                meta.root.uniques.push({
+                    properties: [prop.name, meta.root.discriminatorColumn],
+                });
+            }
             newProp.nullable = true;
             newProp.inherited = !rootProp;
             meta.root.addProperty(newProp);

package/package.json

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

@@ -323,14 +323,47 @@ export class Platform {
     }
     /** Serializes a string array into its database storage format. */
     marshallArray(values) {
-        return values.join(',');
+        return values.map(v => (/[,",\\]/.test(v) ? JSON.stringify(v) : v)).join(',');
     }
     /** Deserializes a database-stored array string back into a string array. */
     unmarshallArray(value) {
         if (value === '') {
             return [];
         }
-        return value.split(',');
+        if (!value.includes('"')) {
+            return value.split(',');
+        }
+        const result = [];
+        let i = 0;
+        while (i < value.length) {
+            if (value[i] === '"') {
+                let j = i + 1;
+                while (j < value.length) {
+                    if (value[j] === '\\') {
+                        j += 2;
+                    }
+                    else if (value[j] === '"') {
+                        j++;
+                        break;
+                    }
+                    else {
+                        j++;
+                    }
+                }
+                result.push(JSON.parse(value.substring(i, j)));
+                i = j + 1;
+            }
+            else {
+                const comma = value.indexOf(',', i);
+                if (comma === -1) {
+                    result.push(value.substring(i));
+                    break;
+                }
+                result.push(value.substring(i, comma));
+                i = comma + 1;
+            }
+        }
+        return result;
     }
     getBlobDeclarationSQL() {
         return 'blob';

package/unit-of-work/ChangeSetPersister.d.ts

@@ -24,6 +24,12 @@ export declare class ChangeSetPersister {
     private checkConcurrencyKeys;
     private persistManagedEntitiesBatch;
     private mapPrimaryKey;
+    /**
+     * After INSERT + hydration, sync all EntityIdentifier placeholders in composite PK arrays
+     * with the real values now present on the entity. This is needed because `mapPrimaryKey`
+     * only handles the first PK column, but any scalar PK in a composite key may be auto-generated.
+     */
+    private syncCompositeIdentifiers;
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
      */

package/unit-of-work/ChangeSetPersister.js

@@ -132,6 +132,7 @@ export class ChangeSetPersister {
             this.mapPrimaryKey(meta, res.insertId ?? res.row?.[meta.primaryKeys[0]], changeSet);
         }
         this.mapReturnedValues(changeSet.entity, changeSet.payload, res.row, meta);
+        this.syncCompositeIdentifiers(changeSet);
         this.markAsPopulated(changeSet, meta);
         wrapped.__initialized = true;
         wrapped.__managed = true;
@@ -178,6 +179,7 @@ export class ChangeSetPersister {
             if (res.rows) {
                 this.mapReturnedValues(changeSet.entity, changeSet.payload, res.rows[i], meta);
             }
+            this.syncCompositeIdentifiers(changeSet);
             this.markAsPopulated(changeSet, meta);
             wrapped.__initialized = true;
             wrapped.__managed = true;
@@ -255,6 +257,24 @@ export class ChangeSetPersister {
             wrapped.__identifier.setValue(value);
         }
     }
+    /**
+     * After INSERT + hydration, sync all EntityIdentifier placeholders in composite PK arrays
+     * with the real values now present on the entity. This is needed because `mapPrimaryKey`
+     * only handles the first PK column, but any scalar PK in a composite key may be auto-generated.
+     */
+    syncCompositeIdentifiers(changeSet) {
+        const wrapped = helper(changeSet.entity);
+        if (!Array.isArray(wrapped.__identifier)) {
+            return;
+        }
+        const pks = changeSet.meta.getPrimaryProps();
+        for (let i = 0; i < pks.length; i++) {
+            const ident = wrapped.__identifier[i];
+            if (ident instanceof EntityIdentifier && pks[i].kind === ReferenceKind.SCALAR) {
+                ident.setValue(changeSet.entity[pks[i].name]);
+            }
+        }
+    }
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
      */
@@ -413,8 +433,8 @@ export class ChangeSetPersister {
             }
             return;
         }
-        if (Array.isArray(value) && value.every(item => item instanceof EntityIdentifier)) {
-            changeSet.payload[prop.name] = value.map(item => item.getValue());
+        if (Array.isArray(value) && value.some(item => item instanceof EntityIdentifier)) {
+            changeSet.payload[prop.name] = value.map(item => (item instanceof EntityIdentifier ? item.getValue() : item));
             return;
         }
         if (prop.kind === ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {

package/utils/Utils.js

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