Fixed parsing issue when dealing with functional calls with multiple …

…arguments
digitallyinduced · Jan 6, 2022 · 4814fd0 · 4814fd0
1 parent ef8150e
commit 4814fd0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/IHP/IDE/SchemaDesigner/Parser.hs b/IHP/IDE/SchemaDesigner/Parser.hs
@@ -429,7 +429,7 @@ intExpr = IntExpression <$> Lexer.decimal
 callExpr :: Parser Expression
 callExpr = do
     func <- qualifiedIdentifier
-    args <- between (char '(') (char ')') (expression `sepBy` char ',')
+    args <- between (char '(') (char ')') (expression `sepBy` (char ',' >> space))
     space
     pure (CallExpression func args)
 

diff --git a/Test/IDE/SchemaDesigner/ParserSpec.hs b/Test/IDE/SchemaDesigner/ParserSpec.hs
@@ -720,6 +720,16 @@ COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UU
                     , check = Just (ExistsExpression (SelectExpression (Select {columns = [IntExpression 1], from = DotExpression (VarExpression "public") "projects", whereClause = EqExpression (DotExpression (VarExpression "projects") "id") (DotExpression (VarExpression "migrations") "project_id")})))
                     }
 
+        it "should parse a call expression with multiple arguments" do
+            let sql = cs [plain|ALTER TABLE a ADD CONSTRAINT source CHECK (num_nonnulls(a, b, c) = 1);|]
+            parseSql sql `shouldBe`  AddConstraint
+                { tableName = "a"
+                , constraint = CheckConstraint
+                    { name = Just "source"
+                    , checkExpression = EqExpression (CallExpression "num_nonnulls" [VarExpression "a",VarExpression "b",VarExpression "c"]) (IntExpression 1)
+                    }
+                }
+
 col :: Column
 col = Column
     { name = ""