mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
Allow => syntax for named cursor arguments in plpgsql.
We've traditionally accepted "name := value" syntax for cursor arguments in plpgsql. But it turns out that the equivalent statements in Oracle use "name => value". Since we accept both forms of punctuation for function arguments, it makes sense to do the same here. Author: Pavel Stehule <pavel.stehule@gmail.com> Reviewed-by: Gilles Darold <gilles@darold.net> Discussion: https://postgr.es/m/CAFj8pRA3d0ARQEMbABa1n6q25AUdNmyO8aGs56XNf9pD4sRMjQ@mail.gmail.com
This commit is contained in:
@ -3955,9 +3955,12 @@ read_cursor_args(PLpgSQL_var *cursor, int until, YYSTYPE *yylvalp, YYLTYPE *yyll
|
||||
tok2;
|
||||
int arglocation;
|
||||
|
||||
/* Check if it's a named parameter: "param := value" */
|
||||
/*
|
||||
* Check if it's a named parameter: "param := value"
|
||||
* or "param => value"
|
||||
*/
|
||||
plpgsql_peek2(&tok1, &tok2, &arglocation, NULL, yyscanner);
|
||||
if (tok1 == IDENT && tok2 == COLON_EQUALS)
|
||||
if (tok1 == IDENT && (tok2 == COLON_EQUALS || tok2 == EQUALS_GREATER))
|
||||
{
|
||||
char *argname;
|
||||
IdentifierLookup save_IdentifierLookup;
|
||||
@ -3983,11 +3986,11 @@ read_cursor_args(PLpgSQL_var *cursor, int until, YYSTYPE *yylvalp, YYLTYPE *yyll
|
||||
parser_errposition(*yyllocp)));
|
||||
|
||||
/*
|
||||
* Eat the ":=". We already peeked, so the error should never
|
||||
* happen.
|
||||
* Eat the ":=" or "=>". We already peeked, so the error should
|
||||
* never happen.
|
||||
*/
|
||||
tok2 = yylex(yylvalp, yyllocp, yyscanner);
|
||||
if (tok2 != COLON_EQUALS)
|
||||
if (tok2 != COLON_EQUALS && tok2 != EQUALS_GREATER)
|
||||
yyerror(yyllocp, NULL, yyscanner, "syntax error");
|
||||
|
||||
any_named = true;
|
||||
|
@ -2419,7 +2419,8 @@ declare
|
||||
p2 int4 := 1006;
|
||||
n int4;
|
||||
begin
|
||||
open c1 (p1 := p1, p2 := p2, debug := 2);
|
||||
-- use both supported syntaxes for named arguments
|
||||
open c1 (p1 := p1, p2 => p2, debug => 2);
|
||||
fetch c1 into n;
|
||||
return n;
|
||||
end $$ language plpgsql;
|
||||
@ -3487,7 +3488,8 @@ begin
|
||||
raise notice '% from %', r.i, c;
|
||||
end loop;
|
||||
-- again, to test if cursor was closed properly
|
||||
for r in c(9,10) loop
|
||||
-- (and while we're at it, test named-parameter notation)
|
||||
for r in c(r2 := 10, r1 => 9) loop
|
||||
raise notice '% from %', r.i, c;
|
||||
end loop;
|
||||
-- and test a parameterless cursor
|
||||
|
@ -2072,7 +2072,8 @@ declare
|
||||
p2 int4 := 1006;
|
||||
n int4;
|
||||
begin
|
||||
open c1 (p1 := p1, p2 := p2, debug := 2);
|
||||
-- use both supported syntaxes for named arguments
|
||||
open c1 (p1 := p1, p2 => p2, debug => 2);
|
||||
fetch c1 into n;
|
||||
return n;
|
||||
end $$ language plpgsql;
|
||||
@ -2934,7 +2935,8 @@ begin
|
||||
raise notice '% from %', r.i, c;
|
||||
end loop;
|
||||
-- again, to test if cursor was closed properly
|
||||
for r in c(9,10) loop
|
||||
-- (and while we're at it, test named-parameter notation)
|
||||
for r in c(r2 := 10, r1 => 9) loop
|
||||
raise notice '% from %', r.i, c;
|
||||
end loop;
|
||||
-- and test a parameterless cursor
|
||||
|
Reference in New Issue
Block a user