Refine the use of terminology around bound and unbound cursors and cursor

variables. Remove the confusing term "reference cursor".

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 3788b8004b09b35eb557d09cc5aedb6982d146e6..f430bcfad0f9a33a25c523a76992d368ebb6623c 100644 (file)
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,4 +1,4 @@
-
+
 
 
   <application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language
@@ -2450,7 +2450,7 @@ DECLARE
 
     
      
-      Bound cursors can also be used without explicitly opening them,
+      Bound cursor variables can also be used without explicitly opening the cursor,
       via the FOR statement described in
       .
      
@@ -2460,13 +2460,13 @@ DECLARE
      <command>OPEN FOR</command> <replaceable>query</replaceable>
 
 
-OPEN unbound_cursor   NO  SCROLL  FOR query;
+OPEN unbound_cursorvar   NO  SCROLL  FOR query;
 
 
        
         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
         refcursor variable).  The query must be a
         SELECT, or something else that returns rows
         (such as EXPLAIN).  The query
@@ -2494,13 +2494,13 @@ OPEN curs1 FOR SELECT * FROM foo WHERE key = mykey;
      <command>OPEN FOR EXECUTE</command>
 
 
-OPEN unbound_cursor   NO  SCROLL  FOR EXECUTE query_string;
+OPEN unbound_cursorvar   NO  SCROLL  FOR EXECUTE query_string;
 
 
          
           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
           refcursor variable).  The query is specified as a string
           expression, in the same way as in the EXECUTE
           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);
      Opening a Bound Cursor
 
 
-OPEN bound_cursor  ( argument_values ) ;
+OPEN bound_cursorvar  ( argument_values ) ;
 
 
          
@@ -2850,7 +2850,7 @@ COMMIT;
 
 
  <<label>> 
-FOR recordvar IN bound_cursor  ( argument_values )  LOOP
+FOR recordvar IN bound_cursorvar  ( argument_values )  LOOP
     statements
 END LOOP  label ;
 

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 8392bce0841aabf201c3f499602d18427f721866..d687d74b7bfacbe75341726bc799f4f7784fd049 100644 (file)
--- 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 0fd9a697915263f82315157f407e69ec8404b5a4..90369ead08f856cd216bcd38c49bae384133da7b 100644 (file)
--- 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();