@mikro-orm/knex 6.2.6-dev.12 → 6.2.6-dev.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.2.6-dev.12",
+  "version": "6.2.6-dev.14",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^6.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.6-dev.12"
+    "@mikro-orm/core": "6.2.6-dev.14"
   }
 }

package/query/QueryBuilder.js

@@ -1278,7 +1278,19 @@ class QueryBuilder {
             }
         }
         addPath(this._populate);
-        for (const [key, join] of Object.entries(this._joins)) {
+        const joins = Object.entries(this._joins);
+        const rootAlias = this.alias;
+        function addParentAlias(alias) {
+            const join = joins.find(j => j[1].alias === alias);
+            if (join && join[1].ownerAlias !== rootAlias) {
+                orderByAliases.push(join[1].ownerAlias);
+                addParentAlias(join[1].ownerAlias);
+            }
+        }
+        for (const orderByAlias of orderByAliases) {
+            addParentAlias(orderByAlias);
+        }
+        for (const [key, join] of joins) {
             const path = join.path?.replace(/\[populate]|\[pivot]|:ref/g, '').replace(new RegExp(`^${meta.className}.`), '');
             if (!populate.has(path ?? '') && !orderByAliases.includes(join.alias)) {
                 delete this._joins[key];