Support lowercased SELECT expressions

digitallyinduced · Jan 14, 2022 · 6aec203 · 6aec203
1 parent 3969ab9
commit 6aec203
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/IHP/IDE/SchemaDesigner/Parser.hs b/IHP/IDE/SchemaDesigner/Parser.hs
@@ -445,11 +445,11 @@ textExpr' = cs <$> do
 
 selectExpr :: Parser Expression
 selectExpr = do
-    lexeme "SELECT"
+    symbol' "SELECT"
     columns <- expression `sepBy` (char ',' >> space)
-    lexeme "FROM"
+    symbol' "FROM"
     from <- expression
-    lexeme "WHERE"
+    symbol' "WHERE"
     whereClause <- expression
     pure (SelectExpression Select { .. })
 

diff --git a/Test/IDE/SchemaDesigner/ParserSpec.hs b/Test/IDE/SchemaDesigner/ParserSpec.hs
@@ -763,6 +763,9 @@ COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UU
         it "should parse negative DoubleExpression's" do
             parseExpression "-1.337" `shouldBe` (DoubleExpression (-1.337))
 
+        it "should parse lower-cased SELECT expressions" do
+            parseExpression "(select company_id from users where id = ihp_user_id())" `shouldBe` SelectExpression (Select {columns = [VarExpression "company_id"], from = VarExpression "users", whereClause = EqExpression (VarExpression "id") (CallExpression "ihp_user_id" [])})
+
 col :: Column
 col = Column
     { name = ""