support double quoted strings and quote escaping

Author: andykent

lib/grammar.coffee

@@ -128,7 +128,8 @@ grammar =
   ]
 
   String: [
-    o 'STRING',                                           -> new StringValue($1)
+    o 'STRING',                                           -> new StringValue($1, "'")
+    o 'DBLSTRING',                                        -> new StringValue($1, '"')
   ]
 
   Literal: [

lib/lexer.coffee

@@ -85,8 +85,12 @@ class Lexer
   seperatorToken:   -> @tokenizeFromRegex('SEPARATOR', SEPARATOR)
   literalToken:     -> @tokenizeFromRegex('LITERAL', LITERAL, 1, 0)
   numberToken:      -> @tokenizeFromRegex('NUMBER', NUMBER)
-  stringToken:      -> @tokenizeFromRegex('STRING', STRING, 1, 0)
-  parensToken:      -> 
+  stringToken:      -> 
+    @tokenizeFromRegex('STRING', STRING, 1, 0) ||
+    @tokenizeFromRegex('DBLSTRING', DBLSTRING, 1, 0)
+    
+    
+  parensToken: -> 
     @tokenizeFromRegex('LEFT_PAREN', /^\(/,) or 
     @tokenizeFromRegex('RIGHT_PAREN', /^\)/,)
 
@@ -121,7 +125,8 @@ class Lexer
   WHITESPACE          = /^[ \n\r]+/
   LITERAL             = /^`?([a-z_][a-z0-9_]{0,})`?/i
   NUMBER              = /^[0-9]+(\.[0-9]+)?/
-  STRING              = /^'(.*?)'/
+  STRING              = /^'([^\\']*(?:\\.[^\\']*)*)'/
+  DBLSTRING           = /^"([^\\"]*(?:\\.[^\\"]*)*)"/
 
 
 

lib/nodes.coffee

@@ -46,8 +46,8 @@ exports.LiteralValue = class LiteralValue
   toString: -> "`#{@values.join('.')}`"
 
 exports.StringValue = class StringValue
-  constructor: (@value) -> null
-  toString: -> "'#{@value}'"
+  constructor: (@value, @quoteType="''") -> null
+  toString: -> "#{@quoteType}#{@value}#{@quoteType}"
 
 exports.NumberValue = class LiteralValue
   constructor: (value) -> @value = Number(value)

test/grammar.spec.coffee

@@ -186,3 +186,24 @@ describe "SQL Grammer", ->
         JOIN `c`
           ON (`a.id` = `c.id`)
       """
+
+    it "doesn't choke on escaped quotes", ->
+      parse("select * from a where foo = 'I\\'m'").toString().should.eql """
+      SELECT *
+        FROM `a`
+        WHERE (`foo` = 'I\\'m')
+      """
+
+    it "allows using double quotes", ->
+      parse('select * from a where foo = "a"').toString().should.eql """
+      SELECT *
+        FROM `a`
+        WHERE (`foo` = "a")
+      """
+
+    it "allows nesting different quote styles", ->
+      parse("""select * from a where foo = "I'm" """).toString().should.eql """
+      SELECT *
+        FROM `a`
+        WHERE (`foo` = "I'm")
+      """