Merge pull request #14 from OKNoah/sort-bug

sort-bug
OKNoah · Dec 16, 2017 · 9947cd6 · 9947cd6
2 parents e9e8b8a + 34a63f3
commit 9947cd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/models/model.js b/models/model.js
@@ -219,13 +219,13 @@ export default class Model {
       query += getWhere()
     }
 
-    if (limit || skip) {
-      query += ` limit ${skip ? skip + ', ' : ''}${limit || 100}`
-    }
-
     if (sort) {
       query += ` sort ${item}.${sort}`
     }
+
+    if (limit || skip) {
+      query += ` limit ${skip ? skip + ', ' : ''}${limit || 100}`
+    }
 
     if (attributes || include) {
       query += getAttributes()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "final-orm",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/OKNoah/final-orm"