support for more select variations in grammer

Author: andykent

lib/grammar.coffee

@@ -23,9 +23,9 @@ grammar =
     o 'SelectFrom OrderClause',                           -> $1.order = $2; $1
     o 'SelectFrom GroupClause',                           -> $1.group = $2; $1
     o 'SelectFrom WhereClause',                           -> $1.where = $2; $1
-    o 'SelectFrom WhereClause OrderClause',               -> "#{$1} #{$2} #{$3}"
-    o 'SelectFrom WhereClause GroupClause',               -> "#{$1} #{$2} #{$3}"
-    o 'SelectFrom WhereClause GroupClause OrderClause',   -> "#{$1} #{$2} #{$3} #{$4}"
+    o 'SelectFrom WhereClause OrderClause',               -> $1.where = $2; $1.order = $3; $1
+    o 'SelectFrom WhereClause GroupClause',               -> $1.where = $2; $1.group = $3; $1
+    o 'SelectFrom WhereClause GroupClause OrderClause',   -> $1.where = $2; $1.group = $3; $1.order = $4; $1
   ]
 
   SelectFrom: [

lib/nodes.coffee

@@ -6,8 +6,8 @@ exports.Select = class Select
       ret = ["SELECT #{@fields.join(', ')}"] 
       ret.push "FROM #{@source}"
       ret.push @where.toString() if @where
-      ret.push @order.toString() if @order
       ret.push @group.toString() if @group
+      ret.push @order.toString() if @order
       ret.join("\n  ")
 
 exports.LiteralValue = class LiteralValue

spec/grammar.spec.coffee

@@ -26,3 +26,28 @@ describe "SQL Grammer", ->
         FROM `my_table`
         WHERE `x` > 1 AND `y` = 'foo'
       """
+
+    it "parses WHERE with ORDER BY clauses", ->
+      expect(parse("SELECT * FROM my_table WHERE x > 1 ORDER BY y ASC").toString()).toEqual """
+      SELECT *
+        FROM `my_table`
+        WHERE `x` > 1
+        ORDER BY `y` ASC
+      """
+
+    it "parses WHERE with GROUP BY clauses", ->
+      expect(parse("SELECT * FROM my_table WHERE x > 1 GROUP BY x, y").toString()).toEqual """
+      SELECT *
+        FROM `my_table`
+        WHERE `x` > 1
+        GROUP BY `x`, `y`
+      """
+
+    it "parses WHERE with GROUP BY and ORDER BY clauses", ->
+      expect(parse("SELECT * FROM my_table WHERE x > 1 GROUP BY x, y ORDER BY COUNT(y) ASC").toString()).toEqual """
+      SELECT *
+        FROM `my_table`
+        WHERE `x` > 1
+        GROUP BY `x`, `y`
+        ORDER BY COUNT(`y`) ASC
+      """