Allow more than 2 ordering expressions. Closes #13

nwronski · nwronski · commit 352ff1a623ff · 2016-02-02T19:10:02.000-05:00
Thank you @gertheber
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,13 @@ All notable changes to this project will be documented in this file.
   from nums n
   where num between 100 AND 200;
   ```
+- Fixed `ORDER BY` grammar to allow more than two ordering expressions.
+
+  ``` sql
+  select color, size, shape, name
+  from eggs
+  order by color asc, size desc, shape asc
+  ```
 
 ## [v0.12.2] - 2016-01-29
 ### Fixed
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -1249,7 +1249,7 @@ select_parts_values "VALUES Clause"
   }
 
 stmt_core_order_list
-  = f:( stmt_core_order_list_item ) o b:( stmt_core_order_list_loop )?
+  = f:( stmt_core_order_list_item ) o b:( stmt_core_order_list_loop )*
   {
     return {
       'result': util.listify(f, b)

Original file line number	Diff line number	Diff line change
`@@ -1249,7 +1249,7 @@ select_parts_values "VALUES Clause"`
`1249`	`1249`	`}`
`1250`	`1250`
`1251`	`1251`	`stmt_core_order_list`
`1252`		`- = f:( stmt_core_order_list_item ) o b:( stmt_core_order_list_loop )?`
	`1252`	`+ = f:( stmt_core_order_list_item ) o b:( stmt_core_order_list_loop )*`
`1253`	`1253`	`{`
`1254`	`1254`	`return {`
`1255`	`1255`	`'result': util.listify(f, b)`