WIP: Feature/enable where with multiples in conditions

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 .DS_Store
 *.swp
-
+.idea

package.json

@@ -3,7 +3,8 @@
   "description": "Lexer and Parser for SQL Syntax",
   "version": "0.5.5",
   "scripts": {
-    "test": "./node_modules/.bin/cake build && ./node_modules/.bin/mocha --require should --compilers coffee:coffee-script/register"
+    "test": "cake build && mocha --require should --compilers coffee:coffee-script/register",
+    "build": "cake build"
   },
   "author": {
     "name": "Andy Kent and Marcelo Camargo",

src/grammar.coffee

@@ -99,6 +99,7 @@ grammar =
 
   WhereClause: [
     o 'WHERE Expression',                                 -> new Where($2)
+    o 'WHERE InConditions',                               -> new Where($2)
   ]
 
   LimitClause: [
@@ -168,6 +169,16 @@ grammar =
     o 'Value'
   ]
 
+  InConditions: [
+    o 'ExpressionList IN ExpressionList',                            -> new InConditions($1, $3)
+  ]
+
+  ExpressionList: [
+    o 'Expression',                                                  -> [$1]
+    o 'ExpressionList SEPARATOR Expression',                         -> new ExpressionList($1, $3)
+    o 'LEFT_PAREN ExpressionList RIGHT_PAREN',                       -> $2
+  ]
+
   CaseBodies: [
     o 'CaseBody'
     o 'CaseBodies CaseBody',                              -> $1.concat $2

src/lexer.coffee

@@ -100,7 +100,8 @@ class Lexer
     @tokenizeFromWord('THEN') or
     @tokenizeFromWord('ELSE') or
     @tokenizeFromWord('END') or
-    @tokenizeFromWord('TOP')
+    @tokenizeFromWord('TOP') or
+    @tokenizeFromWord('IN')
 
 
   dotToken: -> @tokenizeFromWord('DOT', '.')

src/nodes.coffee

@@ -193,3 +193,13 @@ exports.Star = class Star
   constructor: () -> null
   toString: -> '*'
   star: true
+
+exports.ExpressionList =  class ExpressionList
+  constructor: (@expressions, @expression) -> null
+  toString: ->
+    console.log(@expressions.toString && @expressions.toString())
+    return "(#{@expressions}, #{@expression})"
+
+exports.InConditions = class InConditions
+  constructor: (@expression, @conditions) -> null
+  toString: -> "(#{@expression} IN #{@conditions})"

test/grammar.spec.coffee

@@ -366,6 +366,12 @@ describe "SQL Grammar", ->
         FROM `a` AS `b`
       """
 
+    it "parses aliased field", ->
+      parse("""select a b from t""").toString().should.eql """
+        SELECT `a` AS `b`
+          FROM `t`
+      """
+
   describe "STARS", ->
     it "parses stars as multiplication", ->
       parse('SELECT * FROM foo WHERE a = 1*2').toString().should.eql """
@@ -452,3 +458,25 @@ describe "SQL Grammar", ->
         SELECT `x`
           FROM Y()
         """
+
+  describe "WHERE", ->
+    it "parses simple where condition", ->
+      parse("select a from b where a = 10").toString().should.eql """
+        SELECT `a`
+          FROM `b`
+          WHERE (`a` = 10)
+      """
+
+    it "parses simple where condition with in clause", ->
+      parse("select a from b where a in (10, 'ten')").toString().should.eql """
+        SELECT `a`
+          FROM `b`
+          WHERE (`a` IN (10, 'ten'))
+      """
+
+    it "parses where condition with multiple in clauses", ->
+      parse("select value, type from x where (value, type) in ((10, 'ten'), ('number', 'number in full'))").toString().should.eql """
+        SELECT `value`, `type`
+          FROM `x`
+          WHERE (`value` IN (10 'ten') AND (`type` IN ('number', 'number in full')))
+      """