@mikro-orm/sql 7.1.10-dev.1 → 7.1.10-dev.3

package/AbstractSqlDriver.js

@@ -1675,14 +1675,15 @@ export class AbstractSqlDriver extends DatabaseDriver {
         // (including virtual ones, as the owner FK of a polymorphic pivot is only mapped via non-persisted relations)
         const pivotRelations = meta.pivotTable && !meta.compositePK ? meta.relations.filter(p => p.kind === ReferenceKind.MANY_TO_ONE) : [];
         for (const item of rawResults) {
-            let pk = Utils.getCompositeKeyHash(item, meta);
+            // flat hash, so nested composite PK values keep their own separators and cannot collide
+            let pk = Utils.getCompositeKeyHash(item, meta, false, undefined, true);
             if (pivotRelations.length > 0) {
                 pk = Utils.getPrimaryKeyHash([
                     pk,
                     ...pivotRelations.flatMap(p => {
                         const value = item[p.name];
                         // composite FKs are mapped to an array of values, which `extractPK` does not accept
-                        return (Array.isArray(value) ? value : Utils.extractPK(value, p.targetMeta));
+                        return (Array.isArray(value) ? Utils.flatten(value, true) : Utils.extractPK(value, p.targetMeta));
                     }),
                 ]);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.10-dev.1",
+  "version": "7.1.10-dev.3",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.10-dev.1"
+    "@mikro-orm/core": "7.1.10-dev.3"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/QueryBuilder.js

@@ -1104,7 +1104,9 @@ export class QueryBuilder {
         }
         if (stack.length > 0) {
             const merged = this.driver.mergeJoinedResult(stack, this.mainAlias.meta, joinedProps);
-            yield this.mapResult(merged[0], options.mapResults);
+            for (const row of merged) {
+                yield this.mapResult(row, options.mapResults);
+            }
         }
     }
     /**