feat(query-builder): allow ordering by custom expressions

Closes #707
mikro-orm · Aug 10, 2020 · e4674c7 · e4674c7
1 parent 4585d86
commit e4674c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/knex/src/query/QueryBuilderHelper.ts b/packages/knex/src/query/QueryBuilderHelper.ts
@@ -395,10 +395,10 @@ export class QueryBuilderHelper {
       Utils.splitPrimaryKeys(field).forEach(f => {
         const direction = orderBy[k];
         const prop = this.getProperty(f, alias);
-        const noPrefix = prop && prop.persist === false;
+        const noPrefix = (prop && prop.persist === false) || QueryBuilderHelper.isCustomExpression(f);
         const order = Utils.isNumber<QueryOrderNumeric>(direction) ? QueryOrderNumeric[direction] : direction;
         const column = this.mapper(noPrefix ? f : `${alias}.${f}`, type);
-        const rawColumn = column.split('.').map(e => this.knex.ref(e)).join('.');
+        const rawColumn = Utils.isString(column) ? column.split('.').map(e => this.knex.ref(e)).join('.') : column;
 
         ret.push(`${rawColumn} ${order.toLowerCase()}`);
       });

diff --git a/tests/QueryBuilder.test.ts b/tests/QueryBuilder.test.ts
@@ -1403,6 +1403,12 @@ describe('QueryBuilder', () => {
     expect(qb.getQuery()).toEqual('select `e0`.* from `publisher2` as `e0` order by `e0`.`name` desc nulls last, `e0`.`type` asc nulls last');
   });
 
+  test('order by custom expression', async () => {
+    const qb = orm.em.createQueryBuilder(Publisher2);
+    qb.select('*').orderBy({ 'length(name)': QueryOrder.DESC, 'type': QueryOrder.ASC });
+    expect(qb.getQuery()).toEqual('select `e0`.* from `publisher2` as `e0` order by length(name) desc, `e0`.`type` asc');
+  });
+
   test('pg array operators', async () => {
     const pg = await MikroORM.init<PostgreSqlDriver>({
       entities: [Author2, Address2, Book2, BookTag2, Publisher2, Test2, BaseEntity2, Configuration2],