@mikro-orm/core 6.6.12 → 6.6.13-dev.1

package/drivers/DatabaseDriver.js

@@ -233,7 +233,7 @@ class DatabaseDriver {
             if (prop.joinColumns && Array.isArray(data[k])) {
                 const copy = utils_1.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.12",
+  "version": "6.6.13-dev.1",
   "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.12",
+    "mikro-orm": "6.6.13-dev.1",
     "reflect-metadata": "0.2.2"
   }
 }

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

@@ -31,6 +31,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

@@ -105,6 +105,7 @@ class ChangeSetPersister {
             this.mapPrimaryKey(meta, res.insertId, changeSet);
         }
         this.mapReturnedValues(changeSet.entity, changeSet.payload, res.row, meta);
+        this.syncCompositeIdentifiers(changeSet);
         this.markAsPopulated(changeSet, meta);
         wrapped.__initialized = true;
         wrapped.__managed = true;
@@ -148,6 +149,7 @@ 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;
@@ -223,6 +225,24 @@ 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 = (0, entity_1.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 entity_1.EntityIdentifier && pks[i].kind === enums_1.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
      */
@@ -360,8 +380,8 @@ class ChangeSetPersister {
             changeSet.payload[prop.name] = value.getValue();
             return;
         }
-        if (Array.isArray(value) && value.every(item => item instanceof entity_1.EntityIdentifier)) {
-            changeSet.payload[prop.name] = value.map(item => item.getValue());
+        if (Array.isArray(value) && value.some(item => item instanceof entity_1.EntityIdentifier)) {
+            changeSet.payload[prop.name] = value.map(item => item instanceof entity_1.EntityIdentifier ? item.getValue() : item);
             return;
         }
         if (prop.kind === enums_1.ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {