fix: order by alias should not throw (#255)

cyjake · Jan 6, 2022 · d8deacb · d8deacb
1 parent 931cd81
commit d8deacb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/drivers/abstract/spellbook.js b/src/drivers/abstract/spellbook.js
@@ -129,7 +129,7 @@ function createSubspell(spell) {
   subspell.orders = [];
   for (const order of orders) {
     const [token, direction] = order;
-    const { type, qualifiers, value } = token;
+    const { type, qualifiers = [], value } = token;
     if (type == 'id' && qualifiers[0] == baseName) {
       subspell.orders.push([{ type, value }, direction]);
     }
@@ -220,7 +220,7 @@ function formatSelectWithJoin(spell) {
 
   let hoistable = skip > 0 || rowCount > 0;
   if (hoistable) {
-    function checkQualifier({ type, qualifiers }) {
+    function checkQualifier({ type, qualifiers = [] }) {
       if (type === 'id' && qualifiers.length> 0 && !qualifiers.includes(baseName)) {
         hoistable = false;
       }

diff --git a/test/integration/suite/associations.test.js b/test/integration/suite/associations.test.js
@@ -198,4 +198,9 @@ describe('=> Associations order / offset / limit', function() {
     // both posts have comments with content containing `oo` but only one should return
     assert.equal(posts.length, 1);
   });
+
+  it('should not throw if select and order by alias', async function() {
+    const result = await Post.include('comments').select('content as cnt').order('cnt', 'desc').limit(1);
+    assert.equal(result.length, 1);
+  });
 });