Release v0.11.2.

codeschool · Jan 29, 2016 · 8997fbc · 8997fbc
1 parent d3ed55c
commit 8997fbc
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased][unreleased]
 
-## [v0.11.1] - 2016-01-29
+## [v0.11.2] - 2016-01-29
 ### Fixed
 - Refactor to solve the different issues that come from trying to use unquoted reserved words as
 part of table names, column names, aliases, etc... This also addresses issues that came from certain SQLite keywords being fully contained within other keywords (e.g.: `IN` is contained in `INT` which is contained in `INTERSECT`).
@@ -15,6 +15,24 @@ part of table names, column names, aliases, etc... This also addresses issues th
   INTERSECT
   select suit, tie from pants;
   ```
+- Whoops! `order` property of `SELECT` statements contained an object with a `result` key that contained the ordering list instead of just containing the ordering list. It should actually look like this instead:
+
+  ``` json
+  {
+    "order": [
+      {
+        "type": "expression",
+        "variant": "order",
+        "expression": {
+          "type": "identifier",
+          "variant": "column",
+          "name": "hats"
+        },
+        "direction": "asc"
+      }
+    ]
+  }
+  ```
 
 ## [v0.11.0] - 2015-09-29
 ### Changed
@@ -443,8 +461,8 @@ part of table names, column names, aliases, etc... This also addresses issues th
 ### Added
 - First working version of sqlite-parser
 
-[unreleased]: https://github.com/codeschool/sqlite-parser/compare/v0.11.1...HEAD
-[v0.11.1]: https://github.com/codeschool/sqlite-parser/compare/v0.11.0...v0.11.1
+[unreleased]: https://github.com/codeschool/sqlite-parser/compare/v0.11.2...HEAD
+[v0.11.2]: https://github.com/codeschool/sqlite-parser/compare/v0.11.0...v0.11.2
 [v0.11.0]: https://github.com/codeschool/sqlite-parser/compare/v0.10.2...v0.11.0
 [v0.10.2]: https://github.com/codeschool/sqlite-parser/compare/v0.9.8...v0.10.2
 [v0.9.8]: https://github.com/codeschool/sqlite-parser/compare/v0.9.1...v0.9.8

diff --git a/demo/js/sqlite-parser-demo.js b/demo/js/sqlite-parser-demo.js
diff --git a/dist/sqlite-parser-min.js b/dist/sqlite-parser-min.js
diff --git a/dist/sqlite-parser.js b/dist/sqlite-parser.js
@@ -1,5 +1,5 @@
 /*!
- * sqlite-parser - v0.11.1
+ * sqlite-parser - v0.11.2
  * @copyright 2016 Code School (http://codeschool.com)
  * @author Nick Wronski <[email protected]>
  */
@@ -25,7 +25,7 @@ function sqliteParser(source, callback) {
 }
 
 sqliteParser['NAME'] = 'sqlite-parser';
-sqliteParser['VERSION'] = '0.11.1';
+sqliteParser['VERSION'] = '0.11.2';
 
 module.exports = sqliteParser;
 
@@ -917,7 +917,7 @@ module.exports = (function() {
         peg$c178 = { type: "other", description: "ORDER BY Clause" },
         peg$c179 = function(d) {
             return {
-              'order': d
+              'order': d['result']
             };
           },
         peg$c180 = { type: "other", description: "LIMIT Clause" },

diff --git a/lib/parser.js b/lib/parser.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "sqlite-parser",
   "description": "JavaScript implentation of SQLite 3 query parser",
   "author": "Code School (http://codeschool.com)",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "contributors": [
     "Nick Wronski <[email protected]>"
   ],