diff options
| -rw-r--r-- | doc/src/sgml/plpgsql.sgml | 16 | ||||
| -rw-r--r-- | src/include/catalog/pg_type.h | 4 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/gram.y | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index 3788b8004b0..f430bcfad0f 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.141 2009/05/02 17:27:57 tgl Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.142 2009/06/18 10:22:08 petere Exp $ --> <chapter id="plpgsql"> <title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title> @@ -2450,7 +2450,7 @@ DECLARE <note> <para> - Bound cursors can also be used without explicitly opening them, + Bound cursor variables can also be used without explicitly opening the cursor, via the <command>FOR</> statement described in <xref linkend="plpgsql-cursor-for-loop">. </para> @@ -2460,13 +2460,13 @@ DECLARE <title><command>OPEN FOR</command> <replaceable>query</replaceable></title> <synopsis> -OPEN <replaceable>unbound_cursor</replaceable> <optional> <optional> NO </optional> SCROLL </optional> FOR <replaceable>query</replaceable>; +OPEN <replaceable>unbound_cursorvar</replaceable> <optional> <optional> NO </optional> SCROLL </optional> FOR <replaceable>query</replaceable>; </synopsis> <para> The cursor variable is opened and given the specified query to execute. The cursor cannot be open already, and it must have been - declared as an unbound cursor (that is, as a simple + declared as an unbound cursor variable (that is, as a simple <type>refcursor</> variable). The query must be a <command>SELECT</command>, or something else that returns rows (such as <command>EXPLAIN</>). The query @@ -2494,13 +2494,13 @@ OPEN curs1 FOR SELECT * FROM foo WHERE key = mykey; <title><command>OPEN FOR EXECUTE</command></title> <synopsis> -OPEN <replaceable>unbound_cursor</replaceable> <optional> <optional> NO </optional> SCROLL </optional> FOR EXECUTE <replaceable class="command">query_string</replaceable>; +OPEN <replaceable>unbound_cursorvar</replaceable> <optional> <optional> NO </optional> SCROLL </optional> FOR EXECUTE <replaceable class="command">query_string</replaceable>; </synopsis> <para> The cursor variable is opened and given the specified query to execute. The cursor cannot be open already, and it must have been - declared as an unbound cursor (that is, as a simple + declared as an unbound cursor variable (that is, as a simple <type>refcursor</> variable). The query is specified as a string expression, in the same way as in the <command>EXECUTE</command> command. As usual, this gives flexibility so the query plan can vary @@ -2524,7 +2524,7 @@ OPEN curs1 FOR EXECUTE 'SELECT * FROM ' || quote_ident($1); <title>Opening a Bound Cursor</title> <synopsis> -OPEN <replaceable>bound_cursor</replaceable> <optional> ( <replaceable>argument_values</replaceable> ) </optional>; +OPEN <replaceable>bound_cursorvar</replaceable> <optional> ( <replaceable>argument_values</replaceable> ) </optional>; </synopsis> <para> @@ -2850,7 +2850,7 @@ COMMIT; <synopsis> <optional> <<<replaceable>label</replaceable>>> </optional> -FOR <replaceable>recordvar</replaceable> IN <replaceable>bound_cursor</replaceable> <optional> ( <replaceable>argument_values</replaceable> ) </optional> LOOP +FOR <replaceable>recordvar</replaceable> IN <replaceable>bound_cursorvar</replaceable> <optional> ( <replaceable>argument_values</replaceable> ) </optional> LOOP <replaceable>statements</replaceable> END LOOP <optional> <replaceable>label</replaceable> </optional>; </synopsis> diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 8392bce0841..d687d74b7bf 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.205 2009/06/11 14:49:10 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.206 2009/06/18 10:22:09 petere Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -520,7 +520,7 @@ DESCR("numeric(precision, decimal), arbitrary precision number"); #define NUMERICOID 1700 DATA(insert OID = 1790 ( refcursor PGNSP PGUID -1 f b U f t \054 0 0 2201 textin textout textrecv textsend - - - i x f 0 -1 0 _null_ _null_ )); -DESCR("reference cursor (portal name)"); +DESCR("reference to cursor (portal name)"); #define REFCURSOROID 1790 /* OIDS 2200 - 2299 */ diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index 0fd9a697915..90369ead08f 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.124 2009/05/01 23:57:34 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.125 2009/06/18 10:22:09 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1585,7 +1585,7 @@ stmt_open : K_OPEN lno cursor_variable (errcode(ERRCODE_SYNTAX_ERROR), errmsg("syntax error at \"%s\"", yytext), - errdetail("Expected \"FOR\", to open a reference cursor."))); + errdetail("Expected \"FOR\", to open a cursor for an unbound cursor variable."))); } tok = yylex(); |