NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8114885

committed

Improve savepoint error messages

Include the savepoint name in the error message and rephrase it a bit tomatch common style.Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org>

1 parentec87efd commit8114885Copy full SHA for 8114885

File tree

2 files changed

-7

lines changed

src
- backend/access/transam
  - xact.c
- test/regress/expected
  - transactions.out

2 files changed

-7

lines changed

`‎src/backend/access/transam/xact.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3934,7 +3934,7 @@ ReleaseSavepoint(const char *name)`
`3934`	`3934`	`caseTBLOCK_INPROGRESS:`
`3935`	`3935`	`ereport(ERROR,`
`3936`	`3936`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`3937`		`-errmsg("no such savepoint")));`
	`3937`	`+errmsg("savepoint \"%s\" does not exist",name)));`
`3938`	`3938`	`break;`
`3939`	`3939`
`3940`	`3940`	`caseTBLOCK_IMPLICIT_INPROGRESS:`
`@@ -3985,13 +3985,13 @@ ReleaseSavepoint(const char *name)`
`3985`	`3985`	`if (!PointerIsValid(target))`
`3986`	`3986`	`ereport(ERROR,`
`3987`	`3987`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`3988`		`-errmsg("no such savepoint")));`
	`3988`	`+errmsg("savepoint \"%s\" does not exist",name)));`
`3989`	`3989`
`3990`	`3990`	`/* disallow crossing savepoint level boundaries */`
`3991`	`3991`	`if (target->savepointLevel!=s->savepointLevel)`
`3992`	`3992`	`ereport(ERROR,`
`3993`	`3993`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`3994`		`-errmsg("no suchsavepoint")));`
	`3994`	`+errmsg("savepoint \"%s\" does not exist within currentsavepoint level",name)));`
`3995`	`3995`
`3996`	`3996`	`/*`
`3997`	`3997`	`* Mark "commit pending" all subtransactions up to the target`
`@@ -4045,7 +4045,7 @@ RollbackToSavepoint(const char *name)`
`4045`	`4045`	`caseTBLOCK_ABORT:`
`4046`	`4046`	`ereport(ERROR,`
`4047`	`4047`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`4048`		`-errmsg("no such savepoint")));`
	`4048`	`+errmsg("savepoint \"%s\" does not exist",name)));`
`4049`	`4049`	`break;`
`4050`	`4050`
`4051`	`4051`	`caseTBLOCK_IMPLICIT_INPROGRESS:`
`@@ -4094,13 +4094,13 @@ RollbackToSavepoint(const char *name)`
`4094`	`4094`	`if (!PointerIsValid(target))`
`4095`	`4095`	`ereport(ERROR,`
`4096`	`4096`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`4097`		`-errmsg("no such savepoint")));`
	`4097`	`+errmsg("savepoint \"%s\" does not exist",name)));`
`4098`	`4098`
`4099`	`4099`	`/* disallow crossing savepoint level boundaries */`
`4100`	`4100`	`if (target->savepointLevel!=s->savepointLevel)`
`4101`	`4101`	`ereport(ERROR,`
`4102`	`4102`	`(errcode(ERRCODE_S_E_INVALID_SPECIFICATION),`
`4103`		`-errmsg("no suchsavepoint")));`
	`4103`	`+errmsg("savepoint \"%s\" does not exist within currentsavepoint level",name)));`
`4104`	`4104`
`4105`	`4105`	`/*`
`4106`	`4106`	`* Mark "abort pending" all subtransactions up to the target`

`‎src/test/regress/expected/transactions.out`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -749,5 +749,5 @@ begin;`
`749`	`749`	`select 1/0;`
`750`	`750`	`ERROR: division by zero`
`751`	`751`	`rollback to X;`
`752`		`-ERROR:no such savepoint`
	`752`	`+ERROR:savepoint "x" does not exist`
`753`	`753`	`-- DO NOT ADD ANYTHING HERE.`

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!

Commit8114885

File tree

2 files changed

2 files changed

`‎src/backend/access/transam/xact.c`

`‎src/test/regress/expected/transactions.out`

0 commit comments