Merge pull request #35 from safareli/parse

Fix parsing of non-lowercase literals

Author: safareli

src/SqlSquared/Parser.purs

@@ -432,9 +432,9 @@ literal = withToken "literal" case _ of
   Lit (Integer i) → pure $ embed $ Sig.Literal $ EJ.Integer i
   Lit (Decimal d) → pure $ embed $ Sig.Literal $ EJ.Decimal d
   Kw s
-    | s == "null" → pure $ embed $ Sig.Literal $ EJ.Null
-    | s == "true" → pure $ embed $ Sig.Literal $ EJ.Boolean true
-    | s == "false" → pure $ embed $ Sig.Literal $ EJ.Boolean false
+    | S.toLower s == "null" → pure $ embed $ Sig.Literal $ EJ.Null
+    | S.toLower s == "true" → pure $ embed $ Sig.Literal $ EJ.Boolean true
+    | S.toLower s == "false" → pure $ embed $ Sig.Literal $ EJ.Boolean false
   t → P.fail (printToken t)
 
 stringLiteral ∷ ∀ m. Monad m ⇒ P.ParserT TokenStream m String

test/src/Gen.purs

@@ -2,11 +2,10 @@ module Test.Gen where
 
 import Prelude
 
-import Control.Monad.Eff (Eff, foreachE)
+import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE)
 import Control.Monad.Eff.Exception (EXCEPTION)
 import Control.Monad.Eff.Random (RANDOM)
-import Data.Array ((..))
 import Data.Either as E
 import SqlSquared (SqlQuery, arbitrarySqlQueryOfSize, decodeJsonQuery, encodeJsonQuery, printQuery, tokenize)
 import Test.QuickCheck ((<?>))

test/src/Parse.purs

@@ -51,6 +51,42 @@ testSuite = suite "parsers" do
 
 testSuite1 ∷ ∀ e. TestSuite (testOutput ∷ Console.TESTOUTPUT | e)
 testSuite1 = do
+  parseSucc """
+    a := 1; SELECT * FROM `/test`
+  """
+
+  parseSucc """
+    SELECT * FROM `/test`
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS NOT "foo"
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS null
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS true
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS TRUE
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS NULL
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS NOT NULL
+  """
+
+  parseSucc """
+    SELECT * FROM `/smallZips.json` WHERE city IS NOT null
+  """
+
   parseSucc """
     select a from `/f` where b is not between 1 and (2..3)
   """