@mikro-orm/knex 6.0.3-dev.2 → 6.0.3-dev.3

package/AbstractSqlDriver.d.ts

@@ -64,7 +64,7 @@ export declare abstract class AbstractSqlDriver<Connection extends AbstractSqlCo
     protected processManyToMany<T extends object>(meta: EntityMetadata<T> | undefined, pks: Primary<T>[], collections: EntityData<T>, clear: boolean, options?: DriverMethodOptions): Promise<void>;
     lockPessimistic<T extends object>(entity: T, options: LockOptions): Promise<void>;
     protected buildOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], options: Pick<FindOptions<any>, 'strategy' | 'orderBy' | 'populateOrderBy'>): QueryOrderMap<T>[];
-    protected buildPopulateOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populateOrderBy: QueryOrderMap<T>[], parentPath: string, parentAlias?: string): QueryOrderMap<T>[];
+    protected buildPopulateOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populateOrderBy: QueryOrderMap<T>[], parentPath: string, explicit: boolean, parentAlias?: string): QueryOrderMap<T>[];
     protected buildJoinedPropsOrderBy<T extends object>(qb: QueryBuilder<T>, meta: EntityMetadata<T>, populate: PopulateOptions<T>[], options?: Pick<FindOptions<any>, 'strategy' | 'orderBy' | 'populateOrderBy'>, parentPath?: string): QueryOrderMap<T>[];
     protected normalizeFields<T extends object>(fields: Field<T>[], prefix?: string): string[];
     protected processField<T extends object>(meta: EntityMetadata<T>, prop: EntityProperty<T> | undefined, field: string, ret: Field<T>[], populate: PopulateOptions<T>[], joinedProps: PopulateOptions<T>[], qb: QueryBuilder<T>): void;

package/AbstractSqlDriver.js

@@ -983,15 +983,22 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         // as `options.populateWhere` will be always recomputed to respect filters
         const populateWhereAll = options._populateWhere !== 'infer' && !core_1.Utils.isEmpty(options._populateWhere);
         const path = (populateWhereAll ? '[populate]' : '') + meta.className;
-        const populateOrderBy = this.buildPopulateOrderBy(qb, meta, core_1.Utils.asArray(options.populateOrderBy ?? options.orderBy), path);
+        const populateOrderBy = this.buildPopulateOrderBy(qb, meta, core_1.Utils.asArray(options.populateOrderBy ?? options.orderBy), path, !!options.populateOrderBy);
         const joinedPropsOrderBy = this.buildJoinedPropsOrderBy(qb, meta, joinedProps, options, path);
         return [...core_1.Utils.asArray(options.orderBy), ...populateOrderBy, ...joinedPropsOrderBy];
     }
-    buildPopulateOrderBy(qb, meta, populateOrderBy, parentPath, parentAlias = qb.alias) {
+    buildPopulateOrderBy(qb, meta, populateOrderBy, parentPath, explicit, parentAlias = qb.alias) {
         const orderBy = [];
         for (let i = 0; i < populateOrderBy.length; i++) {
             const orderHint = populateOrderBy[i];
             for (const propName of core_1.Utils.keys(orderHint)) {
+                const raw = core_1.RawQueryFragment.getKnownFragment(propName, explicit);
+                if (raw) {
+                    const sql = raw.sql.replace(new RegExp(core_1.ALIAS_REPLACEMENT_RE, 'g'), parentAlias);
+                    const raw2 = new core_1.RawQueryFragment(sql, raw.params);
+                    orderBy.push({ [raw2]: orderHint[propName] });
+                    continue;
+                }
                 const prop = meta.properties[propName];
                 if (!prop) {
                     throw new Error(`Trying to order by not existing property ${meta.className}.${propName}`);
@@ -1008,7 +1015,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     continue;
                 }
                 if (![core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.EMBEDDED].includes(prop.kind) && typeof childOrder === 'object') {
-                    const children = this.buildPopulateOrderBy(qb, meta2, core_1.Utils.asArray(childOrder), path, propAlias);
+                    const children = this.buildPopulateOrderBy(qb, meta2, core_1.Utils.asArray(childOrder), path, explicit, propAlias);
                     orderBy.push(...children);
                     continue;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.3-dev.2",
+  "version": "6.0.3-dev.3",
   "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.0.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.3-dev.2"
+    "@mikro-orm/core": "6.0.3-dev.3"
   }
 }