@mikro-orm/knex 6.4.17-dev.88 → 6.4.17-dev.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.17-dev.88",
+  "version": "6.4.17-dev.89",
   "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.88",
+    "@mikro-orm/core": "6.4.17-dev.89",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/QueryBuilder.js

@@ -189,10 +189,10 @@ class QueryBuilder {
             subquery = field[1] instanceof QueryBuilder ? field[1].getFormattedQuery() : field[1].toString();
             field = field[0];
         }
-        const prop = this.joinReference(field, alias, cond, type, path, schema, subquery);
+        const { prop, key } = this.joinReference(field, alias, cond, type, path, schema, subquery);
         const [fromAlias] = this.helper.splitField(field);
         if (subquery) {
-            this._joins[`${fromAlias}.${prop.name}#${alias}`].subquery = subquery;
+            this._joins[key].subquery = subquery;
         }
         const populate = this._joinedProps.get(fromAlias);
         const item = { field: prop.name, strategy: core_1.LoadStrategy.JOINED, children: [] };
@@ -927,7 +927,8 @@ class QueryBuilder {
                 prop.targetMeta = field.mainAlias.metadata;
                 field = field.getKnexQuery();
             }
-            this._joins[`${this.alias}.${prop.name}#${alias}`] = {
+            const key = `${this.alias}.${prop.name}#${alias}`;
+            this._joins[key] = {
                 prop,
                 alias,
                 type,
@@ -936,7 +937,7 @@ class QueryBuilder {
                 subquery: field.toString(),
                 ownerAlias: this.alias,
             };
-            return prop;
+            return { prop, key };
         }
         if (!subquery && type.includes('lateral')) {
             throw new Error(`Lateral join can be used only with a sub-query.`);
@@ -965,6 +966,7 @@ class QueryBuilder {
         path ??= `${(Object.values(this._joins).find(j => j.alias === fromAlias)?.path ?? entityName)}.${prop.name}`;
         if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY) {
             this._joins[aliasedName] = this.helper.joinOneToReference(prop, fromAlias, alias, type, cond, schema);
+            this._joins[aliasedName].path ??= path;
         }
         else if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
             let pivotAlias = alias;
@@ -976,17 +978,18 @@ class QueryBuilder {
             const joins = this.helper.joinManyToManyReference(prop, fromAlias, alias, pivotAlias, type, cond, path, schema);
             Object.assign(this._joins, joins);
             this.createAlias(prop.pivotEntity, pivotAlias);
+            this._joins[aliasedName].path ??= path;
+            aliasedName = Object.keys(joins)[1];
         }
         else if (prop.kind === core_1.ReferenceKind.ONE_TO_ONE) {
             this._joins[aliasedName] = this.helper.joinOneToReference(prop, fromAlias, alias, type, cond, schema);
+            this._joins[aliasedName].path ??= path;
         }
         else { // MANY_TO_ONE
             this._joins[aliasedName] = this.helper.joinManyToOneReference(prop, fromAlias, alias, type, cond, schema);
+            this._joins[aliasedName].path ??= path;
         }
-        if (!this._joins[aliasedName].path && path) {
-            this._joins[aliasedName].path = path;
-        }
-        return prop;
+        return { prop, key: aliasedName };
     }
     prepareFields(fields, type = 'where') {
         const ret = [];