@mikro-orm/knex 6.4.17-dev.81 → 6.4.17-dev.83

package/AbstractSqlDriver.js

@@ -866,31 +866,26 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
      * @internal
      */
     mergeJoinedResult(rawResults, meta, joinedProps) {
+        if (rawResults.length <= 1) {
+            return rawResults;
+        }
         const res = [];
         const map = {};
+        const collectionsToMerge = {};
+        const hints = joinedProps.map(hint => {
+            const [propName, ref] = hint.field.split(':', 2);
+            return { propName, ref, children: hint.children };
+        });
         for (const item of rawResults) {
             const pk = core_1.Utils.getCompositeKeyHash(item, meta);
             if (map[pk]) {
-                for (const hint of joinedProps) {
-                    const [propName, ref] = hint.field.split(':', 2);
-                    const prop = meta.properties[propName];
+                for (const { propName } of hints) {
                     if (!item[propName]) {
                         continue;
                     }
-                    if ([core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) && ref) {
-                        map[pk][propName] = [...map[pk][propName], ...item[propName]];
-                        continue;
-                    }
-                    switch (prop.kind) {
-                        case core_1.ReferenceKind.ONE_TO_MANY:
-                        case core_1.ReferenceKind.MANY_TO_MANY:
-                            map[pk][propName] = this.mergeJoinedResult([...map[pk][propName], ...item[propName]], prop.targetMeta, hint.children ?? []);
-                            break;
-                        case core_1.ReferenceKind.MANY_TO_ONE:
-                        case core_1.ReferenceKind.ONE_TO_ONE:
-                            map[pk][propName] = this.mergeJoinedResult([map[pk][propName], item[propName]], prop.targetMeta, hint.children ?? [])[0];
-                            break;
-                    }
+                    collectionsToMerge[pk] ??= {};
+                    collectionsToMerge[pk][propName] ??= [map[pk][propName]];
+                    collectionsToMerge[pk][propName].push(item[propName]);
                 }
             }
             else {
@@ -898,6 +893,31 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 res.push(item);
             }
         }
+        for (const pk in collectionsToMerge) {
+            const entity = map[pk];
+            const collections = collectionsToMerge[pk];
+            for (const { propName, ref, children } of hints) {
+                if (!collections[propName]) {
+                    continue;
+                }
+                const prop = meta.properties[propName];
+                const items = collections[propName].flat();
+                if ([core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind) && ref) {
+                    entity[propName] = items;
+                    continue;
+                }
+                switch (prop.kind) {
+                    case core_1.ReferenceKind.ONE_TO_MANY:
+                    case core_1.ReferenceKind.MANY_TO_MANY:
+                        entity[propName] = this.mergeJoinedResult(items, prop.targetMeta, children ?? []);
+                        break;
+                    case core_1.ReferenceKind.MANY_TO_ONE:
+                    case core_1.ReferenceKind.ONE_TO_ONE:
+                        entity[propName] = this.mergeJoinedResult(items, prop.targetMeta, children ?? [])[0];
+                        break;
+                }
+            }
+        }
         return res;
     }
     getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath, count) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.17-dev.81",
+  "version": "6.4.17-dev.83",
   "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",
@@ -66,7 +66,7 @@
     "@mikro-orm/core": "^6.4.16"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.17-dev.81",
+    "@mikro-orm/core": "6.4.17-dev.83",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"