'ORDER BY' should come after 'GROUP BY'

lib/dialects/postgres/query-generator.js

@@ -262,13 +262,6 @@ module.exports = (function() {
         query += " WHERE <%= where %>"
       }
 
-      if(options.order) {
-        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) {
-          return QueryGenerator.addQuotes(g1) + g2
-        })
-        query += " ORDER BY <%= order %>"
-      }
-
       if(options.group) {
         if (Array.isArray(options.group)) {
           options.group = options.group.map(function(grp){
@@ -281,6 +274,13 @@ module.exports = (function() {
         query += " GROUP BY <%= group %>"
       }
 
+      if(options.order) {
+        options.order = options.order.replace(/([^ ]+)(.*)/, function(m, g1, g2) {
+          return QueryGenerator.addQuotes(g1) + g2
+        })
+        query += " ORDER BY <%= order %>"
+      }
+
       if (!(options.include && (options.limit === 1))) {
         if (options.limit) {
           query += " LIMIT <%= limit %>"