Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit726220f

Browse files
committed
Adjust grammar for plpgsql's OPEN command so that a cursor can be
OPENed on non-SELECT commands such as EXPLAIN or SHOW (anything thatreturns tuples is allowed). This flexibility already existed forbound cursors, but OPEN was artificially restricting what it wouldtake. Per a gripe some months back.
1 parentfd97cf4 commit726220f

File tree

2 files changed

+18
-30
lines changed

2 files changed

+18
-30
lines changed

‎doc/src/sgml/plpgsql.sgml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.63 2005/04/0506:22:14 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.64 2005/04/0518:05:45 tgl Exp $
33
-->
44

55
<chapter id="plpgsql">
@@ -2179,19 +2179,21 @@ DECLARE
21792179
</para>
21802180

21812181
<sect3>
2182-
<title><command>OPEN FOR SELECT</command></title>
2182+
<title><command>OPEN FOR</command> <replaceable>query</replaceable></title>
21832183

21842184
<synopsis>
2185-
OPEN <replaceable>unbound_cursor</replaceable> FORSELECT ...;
2185+
OPEN <replaceable>unbound_cursor</replaceable> FOR<replaceable>query</replaceable>;
21862186
</synopsis>
21872187

21882188
<para>
2189-
The cursor variable is opened and given the specified query to
2189+
The cursor variable is opened and given the specified query to
21902190
execute. The cursor cannot be open already, and it must have been
21912191
declared as an unbound cursor (that is, as a simple
2192-
<type>refcursor</> variable). The <command>SELECT</command> query
2193-
is treated in the same way as other <command>SELECT</command>
2194-
statements in <application>PL/pgSQL</>: <application>PL/pgSQL</>
2192+
<type>refcursor</> variable). The query must be a
2193+
<command>SELECT</command>, or something else that returns rows
2194+
(such as <command>EXPLAIN</>). The query
2195+
is treated in the same way as other SQL commands in
2196+
<application>PL/pgSQL</>: <application>PL/pgSQL</>
21952197
variable names are substituted, and the query plan is cached for
21962198
possible reuse.
21972199
</para>
@@ -2216,7 +2218,7 @@ OPEN <replaceable>unbound_cursor</replaceable> FOR EXECUTE <replaceable class="c
22162218
execute. The cursor cannot be open already, and it must have been
22172219
declared as an unbound cursor (that is, as a simple
22182220
<type>refcursor</> variable). The query is specified as a string
2219-
expression in the same way as in the <command>EXECUTE</command>
2221+
expression, in the same way as in the <command>EXECUTE</command>
22202222
command. As usual, this gives flexibility so the query can vary
22212223
from one run to the next.
22222224
</para>

‎src/pl/plpgsql/src/gram.y‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* procedural language
55
*
66
* IDENTIFICATION
7-
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.67 2005/04/0506:22:16 tgl Exp $
7+
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.68 2005/04/0518:05:46 tgl Exp $
88
*
99
* This software is copyrighted by Jan Wieck - Hamburg.
1010
*
@@ -1276,7 +1276,6 @@ stmt_open: K_OPEN lno cursor_varptr
12761276
if ($3->cursor_explicit_expr ==NULL)
12771277
{
12781278
tok =yylex();
1279-
12801279
if (tok != K_FOR)
12811280
{
12821281
plpgsql_error_lineno =$2;
@@ -1288,26 +1287,15 @@ stmt_open: K_OPEN lno cursor_varptr
12881287
}
12891288

12901289
tok =yylex();
1291-
switch (tok)
1290+
if (tok == K_EXECUTE)
12921291
{
1293-
case K_SELECT:
1294-
case'(':
1295-
plpgsql_push_back_token(tok);
1296-
new->query = read_sql_stmt("");
1297-
break;
1298-
1299-
case K_EXECUTE:
1300-
new->dynquery = read_sql_stmt("SELECT");
1301-
break;
1302-
1303-
default:
1304-
plpgsql_error_lineno =$2;
1305-
ereport(ERROR,
1306-
(errcode(ERRCODE_SYNTAX_ERROR),
1307-
errmsg("syntax error at\"%s\"",
1308-
yytext)));
1292+
new->dynquery = read_sql_stmt("SELECT");
1293+
}
1294+
else
1295+
{
1296+
plpgsql_push_back_token(tok);
1297+
new->query = read_sql_stmt("");
13091298
}
1310-
13111299
}
13121300
else
13131301
{
@@ -1316,7 +1304,6 @@ stmt_open: K_OPEN lno cursor_varptr
13161304
char *cp;
13171305

13181306
tok =yylex();
1319-
13201307
if (tok !='(')
13211308
{
13221309
plpgsql_error_lineno = plpgsql_scanner_lineno();
@@ -1369,7 +1356,6 @@ stmt_open: K_OPEN lno cursor_varptr
13691356
else
13701357
{
13711358
tok =yylex();
1372-
13731359
if (tok =='(')
13741360
{
13751361
plpgsql_error_lineno = plpgsql_scanner_lineno();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp