Merge pull request #13 from mistic100/between

Add support of BETWEEN operator

Author: andykent

src/grammar.coffee

@@ -144,13 +144,18 @@ grammar =
     o 'Expression MATH Expression',                       -> new Op($2, $1, $3)
     o 'Expression MATH_MULTI Expression',                 -> new Op($2, $1, $3)
     o 'Expression OPERATOR Expression',                   -> new Op($2, $1, $3)
+    o 'Expression BETWEEN BetweenExpression',             -> new Op($2, $1, $3)
     o 'Expression CONDITIONAL Expression',                -> new Op($2, $1, $3)
     o 'Value SUB_SELECT_OP LEFT_PAREN List RIGHT_PAREN',  -> new Op($2, $1, $4)
     o 'Value SUB_SELECT_OP SubSelectExpression',          -> new Op($2, $1, $3)
     o 'SUB_SELECT_UNARY_OP SubSelectExpression',          -> new UnaryOp($1, $2)
     o 'Value'
   ]
 
+  BetweenExpression: [
+    o 'Expression CONDITIONAL Expression',                -> new BetweenOp([$1, $3])
+  ]
+
   SubSelectExpression: [
     o 'LEFT_PAREN Query RIGHT_PAREN',                     -> new SubSelect($2)
   ]

src/lexer.coffee

@@ -17,6 +17,7 @@ class Lexer
                        @mathToken() or
                        @dotToken() or
                        @conditionalToken() or
+                       @betweenToken() or
                        @subSelectOpToken() or
                        @subSelectUnaryOpToken() or
                        @numberToken() or
@@ -98,6 +99,7 @@ class Lexer
     @tokenizeFromList('MATH', MATH) or
     @tokenizeFromList('MATH_MULTI', MATH_MULTI)
   conditionalToken: -> @tokenizeFromList('CONDITIONAL', SQL_CONDITIONALS)
+  betweenToken:     -> @tokenizeFromList('BETWEEN', SQL_BETWEENS)
   subSelectOpToken: -> @tokenizeFromList('SUB_SELECT_OP', SUB_SELECT_OP)
   subSelectUnaryOpToken: -> @tokenizeFromList('SUB_SELECT_UNARY_OP', SUB_SELECT_UNARY_OP)
   functionToken:    -> @tokenizeFromList('FUNCTION', SQL_FUNCTIONS)
@@ -142,6 +144,7 @@ class Lexer
   SUB_SELECT_OP       = ['IN', 'NOT IN', 'ANY', 'ALL', 'SOME']
   SUB_SELECT_UNARY_OP = ['EXISTS']
   SQL_CONDITIONALS    = ['AND', 'OR']
+  SQL_BETWEENS        = ['BETWEEN', 'NOT BETWEEN']
   BOOLEAN             = ['TRUE', 'FALSE', 'NULL']
   MATH                = ['+', '-']
   MATH_MULTI          = ['/', '*']

src/nodes.coffee

@@ -150,6 +150,10 @@ exports.UnaryOp = class UnaryOp
   constructor: (@operator, @operand) -> null
   toString: -> "(#{@operator.toUpperCase()} #{@operand})"
 
+exports.BetweenOp = class BetweenOp
+  constructor: (@value) -> null
+  toString: -> "#{@value.join(' AND ')}"
+
 exports.Field = class Field
   constructor: (@field, @name=null) -> null
   toString: -> if @name then "#{@field} AS #{@name}" else @field.toString()

test/grammar.spec.coffee

@@ -114,6 +114,13 @@ describe "SQL Grammar", ->
         WHERE ((`a` > 10) AND ((`a` < 30) OR (`b` = 'c')))
       """
 
+    it "parses WHERE clauses with BETWEEN operator", ->
+      parse("SELECT * FROM my_table WHERE a > 10 AND b BETWEEN 4 AND 6 AND c = 4").toString().should.eql """
+      SELECT *
+        FROM `my_table`
+        WHERE (((`a` > 10) AND (`b` BETWEEN 4 AND 6)) AND (`c` = 4))
+      """
+
     it "parses WHERE with ORDER BY clauses", ->
       parse("SELECT * FROM my_table WHERE x > 1 ORDER BY y").toString().should.eql """
       SELECT *