NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit928d022

committed

Fix a few bogus statement type names in plpgsql error messages.

plpgsql's error location context messages ("PL/pgSQL function fn-name lineline-no at stmt-type") would misreport a CONTINUE statement as being anEXIT, and misreport a MOVE statement as being a FETCH. These are clearbugs that have been there a long time, so back-patch to all supportedbranches.In addition, in 9.5 and HEAD, change the description of EXECUTE from"EXECUTE statement" to just plain EXECUTE; there seems no good reason whythis statement type should be described differently from others that havea well-defined head keyword. And distinguish GET STACKED DIAGNOSTICS fromplain GET DIAGNOSTICS. These are a bit more of a judgment call, and alsoaffect existing regression-test outputs, so I did not back-patch intostable branches.Pavel Stehule and Tom Lane

1 parentd509560 commit928d022Copy full SHA for 928d022

File tree

1 file changed

-2

lines changed

src/pl/plpgsql/src
- pl_funcs.c

1 file changed

-2

lines changed

`‎src/pl/plpgsql/src/pl_funcs.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ plpgsql_stmt_typename(PLpgSQL_stmt *stmt)`
`235`	`235`	`casePLPGSQL_STMT_FOREACH_A:`
`236`	`236`	`return_("FOREACH over array");`
`237`	`237`	`casePLPGSQL_STMT_EXIT:`
`238`		`-return"EXIT";`
	`238`	`+return((PLpgSQL_stmt_exit*)stmt)->is_exit ?"EXIT" :"CONTINUE";`
`239`	`239`	`casePLPGSQL_STMT_RETURN:`
`240`	`240`	`return"RETURN";`
`241`	`241`	`casePLPGSQL_STMT_RETURN_NEXT:`
`@@ -255,7 +255,7 @@ plpgsql_stmt_typename(PLpgSQL_stmt *stmt)`
`255`	`255`	`casePLPGSQL_STMT_OPEN:`
`256`	`256`	`return"OPEN";`
`257`	`257`	`casePLPGSQL_STMT_FETCH:`
`258`		`-return"FETCH";`
	`258`	`+return((PLpgSQL_stmt_fetch*)stmt)->is_move ?"MOVE" :"FETCH";`
`259`	`259`	`casePLPGSQL_STMT_CLOSE:`
`260`	`260`	`return"CLOSE";`
`261`	`261`	`casePLPGSQL_STMT_PERFORM:`

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!

Commit928d022

File tree

1 file changed

1 file changed

`‎src/pl/plpgsql/src/pl_funcs.c`

0 commit comments