Tweak new error messages to match the actual syntax of DECLARE CURSOR.

(Last night I copied-and-pasted from the WITH HOLD case, but that's
wrong because of the bizarrely irregular syntax specified by the standard.)

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 6d59401d0fb963f176dea5d26f21606b88092d3e..0ea017906eb2cb1345c7fe0867e2fb27f72e68f6 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.182 2007/10/24 23:27:08 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.183 2007/10/25 13:48:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -994,7 +994,7 @@ SPI_cursor_open(const char *name, SPIPlanPtr plan,
                        ((PlannedStmt *) linitial(stmt_list))->rowMarks != NIL)
                        ereport(ERROR,
                                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("DECLARE CURSOR SCROLL ... FOR UPDATE/SHARE is not supported"),
+                                        errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),
                                         errdetail("Scrollable cursors must be READ ONLY.")));
        }
 

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 567130b18db5947bec9678f94bc843ae1b2db437..099a7c7446ae900867f586bc67ed7fe1716c25bd 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -17,7 +17,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *     $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.368 2007/10/24 23:27:08 tgl Exp $
+ *     $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.369 2007/10/25 13:48:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1627,14 +1627,14 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt)
        if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_SCROLL))
                ereport(ERROR,
                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                         errmsg("DECLARE CURSOR SCROLL ... FOR UPDATE/SHARE is not supported"),
+                         errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),
                                 errdetail("Scrollable cursors must be READ ONLY.")));
 
        /* FOR UPDATE and INSENSITIVE are not compatible */
        if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_INSENSITIVE))
                ereport(ERROR,
                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                         errmsg("DECLARE CURSOR INSENSITIVE ... FOR UPDATE/SHARE is not supported"),
+                         errmsg("DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"),
                                 errdetail("Insensitive cursors must be READ ONLY.")));
 
        /* We won't need the raw querytree any more */