fix: sort not working (#657)

* fix sort order, each sort parameter needs an explicit direction * Remove eslint line disable * Fix tests
postlight · Jan 21, 2017 · ddbcd9e · ddbcd9e
1 parent 20eea5c
commit ddbcd9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/packages/database/query/index.js b/src/packages/database/query/index.js
@@ -165,10 +165,9 @@ class Query<+T: any> extends Promise {
         this.snapshots = this.snapshots
           .filter(([method]) => method !== 'orderByRaw')
           .concat([
-            // eslint-disable-next-line prefer-template
             ['orderByRaw', uniq([columnName, this.model.primaryKey])
-              .map(key => `${this.model.tableName}.${key}`)
-              .join(', ') + ` ${direction}`
+              .map(key => `${this.model.tableName}.${key} ${direction}`)
+              .join(', ')
             ]
           ]);
       }

diff --git a/src/packages/database/test/query.test.js b/src/packages/database/test/query.test.js
@@ -455,7 +455,7 @@ describe('module "database/query"', () => {
         const result = subject.order('createdAt', 'DESC').first();
 
         expect(result.snapshots).to.deep.equal([
-          ['orderByRaw', 'posts.created_at, posts.id DESC'],
+          ['orderByRaw', 'posts.created_at DESC, posts.id DESC'],
           ['limit', 1]
         ]);
       });
@@ -509,7 +509,7 @@ describe('module "database/query"', () => {
         const result = subject.order('createdAt', 'DESC').last();
 
         expect(result.snapshots).to.deep.equal([
-          ['orderByRaw', 'posts.created_at, posts.id DESC'],
+          ['orderByRaw', 'posts.created_at DESC, posts.id DESC'],
           ['limit', 1]
         ]);
       });