lots of clean up to organize tests by category, split out to different files and directories by type, define mocha.opts to run tests directory recursively. refs #3

Author: nwronski

Gruntfile.js

@@ -70,27 +70,27 @@ module.exports = function(grunt) {
         options: {
           failOnError: true
         },
-        command: './node_modules/.bin/pegjs --optimize "speed" src/grammar.pegjs lib/parser.js'
+        command: './node_modules/.bin/pegjs --optimize speed src/grammar.pegjs lib/parser.js'
       },
       test: {
         options: {
           failOnError: true
         },
-        command: './node_modules/.bin/mocha test/index-spec.js --reporter="nyan" --colors'
+        command: './node_modules/.bin/mocha --reporter="nyan"'
       },
       debug: {
         options: {
           failOnError: false,
           debounceDelay: 500,
           forever: true
         },
-        command: 'DEBUG=true ./node_modules/.bin/mocha test/index-spec.js --reporter="list" --colors'
+        command: 'DEBUG=true ./node_modules/.bin/mocha'
       },
       json: {
         options: {
           failOnError: false
         },
-        command: 'UGLY=true DEBUG=true ./node_modules/.bin/mocha test/index-spec.js --colors --reporter="list"'
+        command: 'UGLY=true DEBUG=true ./node_modules/.bin/mocha'
       }
     },
     connect: {

demo/js/sqlite-parser-demo.js

@@ -5,21 +5,20 @@
  * @copyright Code School 2015 {@link http://codeschool.com}
  * @author Nick Wronski <[email protected]>
  */
- ;(function (root) {
-  var parser      = require('./lib/parser');
-
+ ;(function (root, parser) {
   function sqliteParser(source, callback) {
     try {
       callback(null, parser.parse(source));
     } catch (e) {
       callback(e);
     }
   }
+
   sqliteParser['NAME'] = 'sqlite-parser';
   sqliteParser['VERSION'] = '0.10.1';
 
   module.exports = root.sqliteParser = sqliteParser;
-})(typeof self === 'object' ? self : global);
+})(typeof self === 'object' ? self : global, require('./lib/parser'));
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{"./lib/parser":3}],2:[function(require,module,exports){

dist/sqlite-parser-min.js

@@ -3,18 +3,17 @@
  * @copyright Code School 2015 {@link http://codeschool.com}
  * @author Nick Wronski <[email protected]>
  */
- ;(function (root) {
-  var parser      = require('./lib/parser');
-
+ ;(function (root, parser) {
   function sqliteParser(source, callback) {
     try {
       callback(null, parser.parse(source));
     } catch (e) {
       callback(e);
     }
   }
+
   sqliteParser['NAME'] = 'sqlite-parser';
   sqliteParser['VERSION'] = '0.10.1';
 
   module.exports = root.sqliteParser = sqliteParser;
-})(typeof self === 'object' ? self : global);
+})(typeof self === 'object' ? self : global, require('./lib/parser'));

dist/sqlite-parser.js

@@ -0,0 +1,13 @@
+describe('aliases', function() {
+
+  it('basic aliases', function(done) {
+    var resultTree = '{"statement":[{"explain":false,"type":"statement","variant":"select","from":[{"type":"identifier","variant":"table","name":"bananas","alias":"b","index":null}],"where":null,"group":null,"result":[{"type":"identifier","variant":"column","name":"apple","alias":"The Apple"},{"type":"identifier","variant":"column","name":"pear","alias":"the_pear"},{"type":"identifier","variant":"column","name":"orange","alias":"TheOrange"},{"type":"identifier","variant":"column","name":"pineapple","alias":"wherekeyword"}],"distinct":false,"all":false,"order":null,"limit":null,"with":null}]}';
+    tree.equals(resultTree, this, done);
+  });
+
+  it('uncommon aliases', function(done) {
+    var resultTree = '{"statement":[{"explain":false,"type":"statement","variant":"select","from":[{"type":"identifier","variant":"table","name":"hats","alias":"hat","index":null}],"where":null,"group":null,"result":[{"type":"identifier","variant":"star","name":"hat.*"},{"type":"function","name":"count","distinct":false,"args":[{"type":"identifier","variant":"star","name":"*"}],"alias":"pants"}],"distinct":false,"all":false,"order":null,"limit":null,"with":null}]}';
+    tree.equals(resultTree, this, done);
+  });
+
+});

index.js

@@ -0,0 +1,8 @@
+describe('create index', function() {
+
+  it('basic create index', function(done) {
+    var resultTree = '{"statement":[{"explain":false,"type":"statement","variant":"create","format":"index","target":{"type":"identifier","variant":"index","name":"bees.hive_state"},"where":[{"type":"expression","format":"binary","variant":"operation","operation":">","left":{"type":"identifier","variant":"column","name":"anger"},"right":{"type":"literal","variant":"decimal","value":"0"}}],"on":{"target":"hive","columns":[{"type":"identifier","variant":"column","format":"indexed","direction":"asc","name":"happiness","collate":null},{"type":"identifier","variant":"column","format":"indexed","direction":"desc","name":"anger","collate":null}]},"condition":[],"unique":false}]}';
+    tree.equals(resultTree, this, done);
+  });
+
+});