@mikro-orm/sql 7.1.5-dev.21 → 7.1.5-dev.23

package/AbstractSqlDriver.js

@@ -1248,6 +1248,11 @@ export class AbstractSqlDriver extends DatabaseDriver {
         if (owners.length === 0) {
             return {};
         }
+        // The pivot order is recomputed via `getPivotOrderBy`, so the parent `populateOrderBy` must not leak
+        // into the pivot subquery — its keys reference the parent entity, not the pivot (GH #7910).
+        if (options?.populateOrderBy != null) {
+            options = { ...options, populateOrderBy: undefined };
+        }
         const pivotMeta = this.metadata.get(prop.pivotEntity);
         if (prop.discriminatorColumn && QueryHelper.isUnionTargetPolymorphic(prop)) {
             return this.loadFromUnionTargetPolymorphicPivotTable(prop, owners, where, orderBy, ctx, options, pivotJoin);
@@ -2209,6 +2214,20 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 const join = qb.getJoinForPath(path, { matchPopulateJoins: true });
                 const propAlias = qb.getAliasForJoinPath(join ?? path, { matchPopulateJoins: true }) ?? parentAlias;
                 if (!join) {
+                    // an owner to-one relation that is not joined (e.g. ordering a populated collection by such
+                    // a relation's primary key) can be ordered by its local FK columns, matching the `select-in`
+                    // and `balanced` strategies instead of silently dropping the clause
+                    if (prop.owner &&
+                        [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                        Utils.isPlainObject(childOrder)) {
+                        for (const childField of Utils.getObjectQueryKeys(childOrder)) {
+                            const idx = prop.referencedPKs.indexOf(childField);
+                            const order = childOrder[childField];
+                            if (idx !== -1 && order) {
+                                orderBy.push({ [`${parentAlias}.${prop.joinColumns[idx]}`]: order });
+                            }
+                        }
+                    }
                     continue;
                 }
                 if (join &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.5-dev.21",
+  "version": "7.1.5-dev.23",
   "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.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.5-dev.21"
+    "@mikro-orm/core": "7.1.5-dev.23"
   },
   "engines": {
     "node": ">= 22.17.0"