Merge branch 'master'

nwronski · nwronski · commit d3ed55ce3606 · 2016-01-29T14:47:08.000-05:00
diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -931,7 +931,7 @@ stmt_core_order "ORDER BY Clause"
   = ORDER o BY o d:( stmt_core_order_list )
   {
     return {
-      'order': d
+      'order': d['result']
     };
   }
 
diff --git a/test/json/expressions/with-table-expression-2.json b/test/json/expressions/with-table-expression-2.json
@@ -62,19 +62,17 @@
           }
         }
       ],
-      "order": {
-        "result": [
-          {
-            "type": "expression",
-            "variant": "order",
-            "expression": {
-              "type": "identifier",
-              "variant": "column",
-              "name": "born"
-            }
+      "order": [
+        {
+          "type": "expression",
+          "variant": "order",
+          "expression": {
+            "type": "identifier",
+            "variant": "column",
+            "name": "born"
           }
-        ]
-      },
+        }
+      ],
       "with": [
         {
           "type": "expression",
diff --git a/test/json/select/select-alt-syntax.json b/test/json/select/select-alt-syntax.json
@@ -3,20 +3,18 @@
     {
       "type": "statement",
       "variant": "select",
-      "order": {
-        "result": [
-          {
-            "type": "expression",
-            "variant": "order",
-            "expression": {
-              "type": "identifier",
-              "variant": "column",
-              "name": "ham"
-            },
-            "direction": "desc"
-          }
-        ]
-      }
+      "order": [
+        {
+          "type": "expression",
+          "variant": "order",
+          "expression": {
+            "type": "identifier",
+            "variant": "column",
+            "name": "ham"
+          },
+          "direction": "desc"
+        }
+      ]
     }
   ]
 }
diff --git a/test/json/select/select-parts-1.json b/test/json/select/select-parts-1.json
@@ -70,20 +70,18 @@
           "value": "200"
         }
       },
-      "order": {
-        "result": [
-          {
-            "type": "expression",
-            "variant": "order",
-            "expression": {
-              "type": "identifier",
-              "variant": "column",
-              "name": "h.color"
-            },
-            "direction": "desc"
-          }
-        ]
-      },
+      "order": [
+        {
+          "type": "expression",
+          "variant": "order",
+          "expression": {
+            "type": "identifier",
+            "variant": "column",
+            "name": "h.color"
+          },
+          "direction": "desc"
+        }
+      ],
       "limit": {
         "type": "expression",
         "variant": "limit",

Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ stmt_core_order "ORDER BY Clause"`
`931`	`931`	`= ORDER o BY o d:( stmt_core_order_list )`
`932`	`932`	`{`
`933`	`933`	`return {`
`934`		`- 'order': d`
	`934`	`+ 'order': d['result']`
`935`	`935`	`};`
`936`	`936`	`}`
`937`	`937`