Fixed an issue where the parser would get confused between a wildcard * and multiplication *

Author: andykent

browser/sql-parser.js

@@ -28,8 +28,29 @@
         i += bytesConsumed;
       }
       this.token('EOF', '');
+      this.postProcess();
     }
 
+    Lexer.prototype.postProcess = function() {
+      var i, next_token, token, _i, _len, _ref, _results;
+      _ref = this.tokens;
+      _results = [];
+      for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
+        token = _ref[i];
+        if (token[0] === 'STAR') {
+          next_token = this.tokens[i + 1];
+          if (!(next_token[0] === 'SEPARATOR' || next_token[0] === 'FROM')) {
+            _results.push(token[0] = 'MATH_MULTI');
+          } else {
+            _results.push(void 0);
+          }
+        } else {
+          _results.push(void 0);
+        }
+      }
+      return _results;
+    };
+
     Lexer.prototype.token = function(name, value) {
       return this.tokens.push([name, value, this.currentLine]);
     };

lib/lexer.js

@@ -26,6 +26,14 @@ class Lexer
       throw new Error("NOTHING CONSUMED: Stopped at - '#{@chunk.slice(0,30)}'") if bytesConsumed < 1
       i += bytesConsumed
     @token('EOF', '')
+    @postProcess()
+
+  postProcess: ->
+    for token, i in @tokens
+      if token[0] is 'STAR'
+        next_token = @tokens[i+1]
+        unless next_token[0] is 'SEPARATOR' or next_token[0] is 'FROM'
+          token[0] = 'MATH_MULTI'
 
   token: (name, value) ->
     @tokens.push([name, value, @currentLine])

src/lexer.coffee

@@ -245,3 +245,11 @@ describe "SQL Grammer", ->
             FROM `bar`
         ))
       """
+
+  describe "STARS", ->
+    it "parses stars as multiplcation", ->
+      parse('SELECT * FROM foo WHERE a = 1*2').toString().should.eql """
+      SELECT *
+        FROM `foo`
+        WHERE (`a` = (1 * 2))
+      """

test/grammar.spec.coffee

@@ -11,6 +11,23 @@ describe "SQL Lexer", ->
       ["EOF", "", 1]
     ]
 
+  it "eats select queries with stars and multiplication", ->
+    tokens = lexer.tokenize("select * from my_table where foo = 1 * 2")
+    tokens.should.eql [
+      ["SELECT", "select", 1]
+      ["STAR", "*", 1]
+      ["FROM", "from", 1]
+      ["LITERAL", "my_table", 1]
+      ["WHERE", "where", 1]
+      ["LITERAL", "foo", 1]
+      ["OPERATOR", "=", 1]
+      ["NUMBER", "1", 1]
+      ["MATH_MULTI", "*", 1]
+      ["NUMBER", "2", 1]
+      ["EOF", "", 1]
+    ]
+
+
   it "eats sub selects", ->
     tokens = lexer.tokenize("select * from (select * from my_table) t")
     tokens.should.eql [