Merge pull request #328 from cmingxu/master

switch position for options.order and options.group

lib/dialects/mysql/query-generator.js

@@ -178,15 +178,16 @@ module.exports = (function() {
         query += " WHERE <%= where %>"
         query += " WHERE <%= where %>"
       }
       }
 
 
-      if(options.order) {
-        query += " ORDER BY <%= order %>"
-      }
-
       if(options.group) {
       if(options.group) {
         options.group = Utils.addTicks(options.group)
         options.group = Utils.addTicks(options.group)
         query += " GROUP BY <%= group %>"
         query += " GROUP BY <%= group %>"
       }
       }
 
 
+      if(options.order) {
+        query += " ORDER BY <%= order %>"
+      }
+
+
       if(options.limit && !(options.include && (options.limit === 1))) {
       if(options.limit && !(options.include && (options.limit === 1))) {
         if(options.offset) {
         if(options.offset) {
           query += " LIMIT <%= offset %>, <%= limit %>"
           query += " LIMIT <%= offset %>, <%= limit %>"

spec-jasmine/mysql/query-generator.spec.js

@@ -74,6 +74,10 @@ describe('QueryGenerator', function() {
         expectation: "SELECT * FROM `myTable` GROUP BY `name`;",
         expectation: "SELECT * FROM `myTable` GROUP BY `name`;",
         context: QueryGenerator
         context: QueryGenerator
       }, {
       }, {
+        arguments: ['myTable', {group: "name", order: "id DESC"}],
+        expectation: "SELECT * FROM `myTable` GROUP BY `name` ORDER BY id DESC;",
+        context: QueryGenerator
+      }, {
         arguments: ['myTable', {limit: 10}],
         arguments: ['myTable', {limit: 10}],
         expectation: "SELECT * FROM `myTable` LIMIT 10;",
         expectation: "SELECT * FROM `myTable` LIMIT 10;",
         context: QueryGenerator
         context: QueryGenerator