From ffd93d16fd046bf0352eec914f3ae087390370ef Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 28 Feb 2018 23:22:17 -0500
Subject: [PATCH] PL/pgSQL: Allow calling procedures without CALL keyword

For compatibility with Oracle, allow calling procedures without the CALL
keyword.  So

    BEGIN
      someproc();
    END

is the same thing as

    BEGIN
      CALL someproc();
    END

This works as long as someproc is not a keyword.
---
 src/pl/plpgsql/src/expected/plpgsql_call.out |  6 ++++-
 src/pl/plpgsql/src/pl_gram.y                 | 34 ++++++++++++++++++++++++++--
 src/pl/plpgsql/src/sql/plpgsql_call.sql      |  2 ++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/pl/plpgsql/src/expected/plpgsql_call.out b/src/pl/plpgsql/src/expected/plpgsql_call.out
index e2442c603c..11288ede87 100644
--- a/src/pl/plpgsql/src/expected/plpgsql_call.out
+++ b/src/pl/plpgsql/src/expected/plpgsql_call.out
@@ -43,6 +43,8 @@ AS $$
 BEGIN
     CALL test_proc3(y);
     CALL test_proc3($1);
+    test_proc3(y);
+    public.test_proc3(y);
 END;
 $$;
 CALL test_proc4(66);
@@ -51,7 +53,9 @@ SELECT * FROM test1;
 ----
  66
  66
-(2 rows)
+ 66
+ 66
+(4 rows)
 
 DROP PROCEDURE test_proc1;
 DROP PROCEDURE test_proc2;
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 688fbd6531..3c9b3e9fce 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -1921,7 +1921,25 @@ stmt_execsql	: K_IMPORT
 						plpgsql_push_back_token(tok);
 						if (tok == '=' || tok == COLON_EQUALS || tok == '[')
 							word_is_not_variable(&($1), @1);
-						$$ = make_execsql_stmt(T_WORD, @1);
+						else if (tok == '(' &&
+								/* check for keywords that can be followed by ( */
+								 ($1.quoted || (strcmp($1.ident, "explain") != 0 &&
+												strcmp($1.ident, "reindex") != 0 &&
+												strcmp($1.ident, "select") != 0 &&
+												strcmp($1.ident, "vacuum") != 0 &&
+												strcmp($1.ident, "values") != 0)))
+						{
+							PLpgSQL_stmt_execsql *new;
+
+							new = palloc0(sizeof(PLpgSQL_stmt_execsql));
+							new->cmd_type = PLPGSQL_STMT_EXECSQL;
+							new->lineno = plpgsql_location_to_lineno(@1);
+							new->sqlstmt = read_sql_stmt(psprintf("CALL %s", quote_identifier(($1).ident)));
+
+							$$ = (PLpgSQL_stmt *)new;
+						}
+						else
+							$$ = make_execsql_stmt(T_WORD, @1);
 					}
 				| T_CWORD
 					{
@@ -1931,7 +1949,19 @@ stmt_execsql	: K_IMPORT
 						plpgsql_push_back_token(tok);
 						if (tok == '=' || tok == COLON_EQUALS || tok == '[')
 							cword_is_not_variable(&($1), @1);
-						$$ = make_execsql_stmt(T_CWORD, @1);
+						else if (tok == '(')
+						{
+							PLpgSQL_stmt_execsql *new;
+
+							new = palloc0(sizeof(PLpgSQL_stmt_execsql));
+							new->cmd_type = PLPGSQL_STMT_EXECSQL;
+							new->lineno = plpgsql_location_to_lineno(@1);
+							new->sqlstmt = read_sql_stmt(psprintf("CALL %s", NameListToQuotedString(($1).idents)));
+
+							$$ = (PLpgSQL_stmt *)new;
+						}
+						else
+							$$ = make_execsql_stmt(T_CWORD, @1);
 					}
 				;
 
diff --git a/src/pl/plpgsql/src/sql/plpgsql_call.sql b/src/pl/plpgsql/src/sql/plpgsql_call.sql
index 321ed43af8..845a4d1a65 100644
--- a/src/pl/plpgsql/src/sql/plpgsql_call.sql
+++ b/src/pl/plpgsql/src/sql/plpgsql_call.sql
@@ -49,6 +49,8 @@ CREATE PROCEDURE test_proc4(y int)
 BEGIN
     CALL test_proc3(y);
     CALL test_proc3($1);
+    test_proc3(y);
+    public.test_proc3(y);
 END;
 $$;
 

base-commit: 51057feaa6bd24b51e6a4715c2090491ef037534
-- 
2.16.2