@mikro-orm/knex 5.8.4-dev.4 → 5.8.4-dev.5

package/AbstractSqlDriver.js

@@ -133,7 +133,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return null;
         }
         if (qb) {
+            // here we map the aliased results (cartesian product) to an object graph
             this.mapJoinedProps(ret, meta, populate, qb, ret, map);
+            // we need to remove the cycles from the mapped values
+            core_1.Utils.removeCycles(ret, meta);
         }
         return ret;
     }
@@ -148,7 +151,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             const meta2 = this.metadata.find(relation.type);
             const path = parentJoinPath ? `${parentJoinPath}.${relation.name}` : `${meta.name}.${relation.name}`;
             const relationAlias = qb.getAliasForJoinPath(path);
-            const relationPojo = {};
+            let relationPojo = {};
             // If the primary key value for the relation is null, we know we haven't joined to anything
             // and therefore we don't return any record (since all values would be null)
             const hasPK = meta2.primaryKeys.every(pk => meta2.properties[pk].fieldNames.every(name => {
@@ -176,7 +179,16 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     delete root[alias];
                 }
             });
-            const key = `${meta.name}-${(core_1.Utils.getCompositeKeyHash(result, meta))}`;
+            const key = `${meta.name}-${core_1.Utils.getCompositeKeyHash(result, meta)}`;
+            const key2 = `${meta2.name}-${core_1.Utils.getCompositeKeyHash(relationPojo, meta2)}`;
+            if (map[key2]) {
+                const old = map[key2];
+                Object.assign(old, relationPojo);
+                relationPojo = old;
+            }
+            else {
+                map[key2] = relationPojo;
+            }
             if (map[key]) {
                 result[relation.name] = map[key][relation.name];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.8.4-dev.4",
+  "version": "5.8.4-dev.5",
   "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,9 +66,9 @@
     "@mikro-orm/core": "^5.8.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.8.4-dev.4",
-    "@mikro-orm/entity-generator": "~5.8.4-dev.4",
-    "@mikro-orm/migrations": "~5.8.4-dev.4",
+    "@mikro-orm/core": "~5.8.4-dev.5",
+    "@mikro-orm/entity-generator": "~5.8.4-dev.5",
+    "@mikro-orm/migrations": "~5.8.4-dev.5",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",