fixed parser ambiguity for nameless args

Postgres' SQL is ambiguous in that it treats VARYING as non-reserved this leads to ambiguity in 'CREATE FUNCTION f(character varying)' which can be recognized as nameless argument of type 'character varying' or argument 'character' of type 'varying' the implemented workaround is the one that Postgres uses it forbids technically correct 'character schema_name.varying' argument declaration but allows for the original issue to be resolved
pgcodekeeper · Jul 19, 2018 · f0f50ae · f0f50ae
1 parent badf9cf
commit f0f50ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/apgdiff/antlr-src/SQLParser.g4 b/apgdiff/antlr-src/SQLParser.g4
@@ -719,7 +719,7 @@ character_string
     ;
 
 function_arguments
-    :arg_mode=argmode? argname=identifier? argtype_data=data_type function_def_value?
+    :arg_mode=argmode? argname=identifier_nontype? argtype_data=data_type function_def_value?
     ;
 
 function_def_value
@@ -1766,7 +1766,7 @@ function_call
     ;
 
 function_name
-  : data_type
+  : schema_qualified_name_nontype
   // allow for all built-in function except those with explicit syntax rules defined
   | (identifier DOT)? tokens_simple_functions
   ;

diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/ReferenceListener.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/ReferenceListener.java
@@ -305,7 +305,7 @@ public void createTrigger(Create_trigger_statementContext ctx) {
                 ParserAbstract.getFullCtxText(ctx.getParent()));
 
         Schema_qualified_name_nontypeContext funcNameCtx = ctx.func_name.function_name()
-                .data_type().predefined_type().schema_qualified_name_nontype();
+                .schema_qualified_name_nontype();
         IdentifierContext sch = funcNameCtx.schema;
         String funcSchema = sch != null ?  sch.getText() : getDefSchemaName();
         String funcName = funcNameCtx.identifier_nontype().getText();

diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/expr/ValueExpr.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/expr/ValueExpr.java
@@ -307,13 +307,11 @@ public Pair<String, String> function(Function_callContext function) {
 
         String schemaName = null;
         String functionName;
-        Data_typeContext dataTypeCtx = funcNameCtx.data_type();
-        Schema_qualified_name_nontypeContext funcNameQualCtx;
+        Schema_qualified_name_nontypeContext funcNameQualCtx = funcNameCtx.schema_qualified_name_nontype();
 
         IdentifierContext id;
         Tokens_simple_functionsContext tokensSimpleFunc;
-        if (dataTypeCtx != null &&
-                (funcNameQualCtx = dataTypeCtx.predefined_type().schema_qualified_name_nontype()) != null) {
+        if (funcNameQualCtx != null) {
             functionName = funcNameQualCtx.identifier_nontype().getText();
 
             if ((id = funcNameQualCtx.identifier()) != null) {

diff --git a/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/statements/CreateTrigger.java b/apgdiff/src/main/java/cz/startnet/utils/pgdiff/parsers/antlr/statements/CreateTrigger.java
@@ -98,7 +98,7 @@ public PgStatement getObject() {
         }
 
         Schema_qualified_name_nontypeContext funcNameCtx = ctx.func_name.function_name()
-                .data_type().predefined_type().schema_qualified_name_nontype();
+                .schema_qualified_name_nontype();
         IdentifierContext sch = funcNameCtx.schema;
         String schName = sch != null ?  sch.getText() : getDefSchemaName();
         String objName = funcNameCtx.identifier_nontype().getText();