database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Add support for IN as alternative to FROM in PL/PgSQL's FETCH statement,

Browse Source 
for consistency with the backend's FETCH command. Patch from Pavel
Stehule, reviewed by Neil Conway.
This commit is contained in:
Neil Conway 2007-04-28 23:54:59 +00:00
parent bbbe825f5f
commit f2321a3f37
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/plpgsql.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.107 2007/04/16 17:21:22 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.108 2007/04/28 23:54:58 neilc Exp $ -->
<chapter id="plpgsql"> <chapter id="plpgsql">
<title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title> <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>
@ -2523,7 +2523,7 @@ OPEN curs3(42);
<title><literal>FETCH</></title> <title><literal>FETCH</></title>
<synopsis> <synopsis>
FETCH <optional> <replaceable>direction</replaceable> FROM </optional> <replaceable>cursor</replaceable> INTO <replaceable>target</replaceable>; FETCH <optional> <replaceable>direction</replaceable> { FROM | IN } </optional> <replaceable>cursor</replaceable> INTO <replaceable>target</replaceable>;
</synopsis> </synopsis>
<para> <para>

25
src/pl/plpgsql/src/gram.y
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.100 2007/04/16 17:21:23 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.101 2007/04/28 23:54:59 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2043,13 +2043,15 @@ read_fetch_direction(void)
else if (pg_strcasecmp(yytext, "absolute") == 0) else if (pg_strcasecmp(yytext, "absolute") == 0)
{ {
fetch->direction = FETCH_ABSOLUTE; fetch->direction = FETCH_ABSOLUTE;
fetch->expr = plpgsql_read_expression(K_FROM, "FROM"); fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
"SELECT ", true, true, NULL);
check_FROM = false; check_FROM = false;
} }
else if (pg_strcasecmp(yytext, "relative") == 0) else if (pg_strcasecmp(yytext, "relative") == 0)
{ {
fetch->direction = FETCH_RELATIVE; fetch->direction = FETCH_RELATIVE;
fetch->expr = plpgsql_read_expression(K_FROM, "FROM"); fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
"SELECT ", true, true, NULL);
check_FROM = false; check_FROM = false;
} }
else if (pg_strcasecmp(yytext, "forward") == 0) else if (pg_strcasecmp(yytext, "forward") == 0)
@ -2060,6 +2062,13 @@ read_fetch_direction(void)
{ {
fetch->direction = FETCH_BACKWARD; fetch->direction = FETCH_BACKWARD;
} }
else if (tok != T_SCALAR)
{
plpgsql_push_back_token(tok);
fetch->expr = read_sql_construct(K_FROM, K_IN, "FROM or IN",
"SELECT ", true, true, NULL);
check_FROM = false;
}
else else
{ {
/* Assume there's no direction clause */ /* Assume there's no direction clause */
@ -2067,9 +2076,13 @@ read_fetch_direction(void)
check_FROM = false; check_FROM = false;
} }
/* check FROM keyword after direction's specification */ /* check FROM or IN keyword after direction's specification */
if (check_FROM && yylex() != K_FROM) if (check_FROM)
yyerror("expected \"FROM\""); {
tok = yylex();
if (tok != K_FROM && tok != K_IN)
yyerror("expected FROM or IN");
}
return fetch; return fetch;
} }

2
src/test/regress/expected/plpgsql.out
View File

@ -2245,7 +2245,7 @@ select refcursor_test1('test1');
test1 test1
(1 row) (1 row)
fetch next from test1; fetch next in test1;
a a
--- ---
5 5

2
src/test/regress/sql/plpgsql.sql
View File

@ -1918,7 +1918,7 @@ $$ language plpgsql;
begin; begin;
select refcursor_test1('test1'); select refcursor_test1('test1');
fetch next from test1; fetch next in test1;
select refcursor_test1('test2'); select refcursor_test1('test2');
fetch all from test2; fetch all from test2;