NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitfcc20bd

committed

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'swrong because of the bizarrely irregular syntax specified by the standard.)

1 parent0e3ddc8 commitfcc20bdCopy full SHA for fcc20bd

File tree

2 files changed

-5

lines changed

src/backend
- executor
  - spi.c
- parser
  - analyze.c

2 files changed

-5

lines changed

`‎src/backend/executor/spi.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.182 2007/10/24 23:27:08 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.183 2007/10/25 13:48:57 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -994,7 +994,7 @@ SPI_cursor_open(const char *name, SPIPlanPtr plan,`
`994`	`994`	`((PlannedStmt*)linitial(stmt_list))->rowMarks!=NIL)`
`995`	`995`	`ereport(ERROR,`
`996`	`996`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`997`		`-errmsg("DECLARECURSORSCROLL ... FOR UPDATE/SHARE is not supported"),`
	`997`	`+errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),`
`998`	`998`	`errdetail("Scrollable cursors must be READ ONLY.")));`
`999`	`999`	`}`
`1000`	`1000`

`‎src/backend/parser/analyze.c‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`18`	`18`	`* Portions Copyright (c) 1994, Regents of the University of California`
`19`	`19`	`*`
`20`		`- *$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.368 2007/10/24 23:27:08 tgl Exp $`
	`20`	`+ *$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.369 2007/10/25 13:48:57 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -1627,14 +1627,14 @@ transformDeclareCursorStmt(ParseState pstate, DeclareCursorStmt stmt)`
`1627`	`1627`	`if (result->rowMarks!=NIL&& (stmt->options&CURSOR_OPT_SCROLL))`
`1628`	`1628`	`ereport(ERROR,`
`1629`	`1629`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`1630`		`-errmsg("DECLARECURSORSCROLL ... FOR UPDATE/SHARE is not supported"),`
	`1630`	`+errmsg("DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"),`
`1631`	`1631`	`errdetail("Scrollable cursors must be READ ONLY.")));`
`1632`	`1632`
`1633`	`1633`	`/* FOR UPDATE and INSENSITIVE are not compatible */`
`1634`	`1634`	`if (result->rowMarks!=NIL&& (stmt->options&CURSOR_OPT_INSENSITIVE))`
`1635`	`1635`	`ereport(ERROR,`
`1636`	`1636`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`1637`		`-errmsg("DECLARECURSORINSENSITIVE ... FOR UPDATE/SHARE is not supported"),`
	`1637`	`+errmsg("DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"),`
`1638`	`1638`	`errdetail("Insensitive cursors must be READ ONLY.")));`
`1639`	`1639`
`1640`	`1640`	`/* We won't need the raw querytree any more */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfcc20bd

File tree

2 files changed

2 files changed

`‎src/backend/executor/spi.c‎`

`‎src/backend/parser/analyze.c‎`

0 commit comments