NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commitc9301de

committed

Reword SPI_ERROR_TRANSACTION errors in PL/pgSQL

The previous message for SPI_ERROR_TRANSACTION claimed "cannot begin/endtransactions in PL/pgSQL", but that is no longer true. Nevertheless,the error can still happen, so reword the messages. The error cases inexec_prepare_plan() could never happen, so remove them.

1 parenta40cff8 commitc9301deCopy full SHA for c9301de

File tree

3 files changed

+32

-27

lines changed

src/pl/plpgsql/src
- expected
  - plpgsql_transaction.out
- pl_exec.c
- sql
  - plpgsql_transaction.sql

3 files changed

+32

-27

lines changed

`‎src/pl/plpgsql/src/expected/plpgsql_transaction.out`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ $$;`
`409`	`409`	`INFO: read committed`
`410`	`410`	`INFO: repeatable read`
`411`	`411`	`INFO: read committed`
`412`		`--- errorcase`
	`412`	`+-- errorcases`
`413`	`413`	`DO LANGUAGE plpgsql $$`
`414`	`414`	`BEGIN`
`415`	`415`	`SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;`
`@@ -418,6 +418,20 @@ $$;`
`418`	`418`	`ERROR: SET TRANSACTION ISOLATION LEVEL must be called before any query`
`419`	`419`	`CONTEXT: SQL statement "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ"`
`420`	`420`	`PL/pgSQL function inline_code_block line 3 at SET`
	`421`	`+DO LANGUAGE plpgsql $$`
	`422`	`+BEGIN`
	`423`	`+ SAVEPOINT foo;`
	`424`	`+END;`
	`425`	`+$$;`
	`426`	`+ERROR: unsupported transaction command in PL/pgSQL`
	`427`	`+CONTEXT: PL/pgSQL function inline_code_block line 3 at SQL statement`
	`428`	`+DO LANGUAGE plpgsql $$`
	`429`	`+BEGIN`
	`430`	`+ EXECUTE 'COMMIT';`
	`431`	`+END;`
	`432`	`+$$;`
	`433`	`+ERROR: EXECUTE of transaction commands is not implemented`
	`434`	`+CONTEXT: PL/pgSQL function inline_code_block line 3 at EXECUTE`
`421`	`435`	`DROP TABLE test1;`
`422`	`436`	`DROP TABLE test2;`
`423`	`437`	`DROP TABLE test3;`

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

Lines changed: 4 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -3965,27 +3965,8 @@ exec_prepare_plan(PLpgSQL_execstate *estate,`
`3965`	`3965`	`(void*)expr,`
`3966`	`3966`	`cursorOptions);`
`3967`	`3967`	`if (plan==NULL)`
`3968`		`-{`
`3969`		`-/* Some SPI errors deserve specific error messages */`
`3970`		`-switch (SPI_result)`
`3971`		`-{`
`3972`		`-caseSPI_ERROR_COPY:`
`3973`		`-ereport(ERROR,`
`3974`		`-(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`3975`		`-errmsg("cannot COPY to/from client in PL/pgSQL")));`
`3976`		`-break;`
`3977`		`-caseSPI_ERROR_TRANSACTION:`
`3978`		`-ereport(ERROR,`
`3979`		`-(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`3980`		`-errmsg("cannot begin/end transactions in PL/pgSQL"),`
`3981`		`-errhint("Use a BEGIN block with an EXCEPTION clause instead.")));`
`3982`		`-break;`
`3983`		`-default:`
`3984`		`-elog(ERROR,"SPI_prepare_params failed for \"%s\": %s",`
`3985`		`-expr->query,SPI_result_code_string(SPI_result));`
`3986`		`-break;`
`3987`		`-}`
`3988`		`-}`
	`3968`	`+elog(ERROR,"SPI_prepare_params failed for \"%s\": %s",`
	`3969`	`+expr->query,SPI_result_code_string(SPI_result));`
`3989`	`3970`	`if (keepplan)`
`3990`	`3971`	`SPI_keepplan(plan);`
`3991`	`3972`	`expr->plan=plan;`
`@@ -4129,8 +4110,7 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,`
`4129`	`4110`	`caseSPI_ERROR_TRANSACTION:`
`4130`	`4111`	`ereport(ERROR,`
`4131`	`4112`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`4132`		`-errmsg("cannot begin/end transactions in PL/pgSQL"),`
`4133`		`-errhint("Use a BEGIN block with an EXCEPTION clause instead.")));`
	`4113`	`+errmsg("unsupported transaction command in PL/pgSQL")));`
`4134`	`4114`	`break;`
`4135`	`4115`
`4136`	`4116`	`default:`
`@@ -4317,8 +4297,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,`
`4317`	`4297`	`caseSPI_ERROR_TRANSACTION:`
`4318`	`4298`	`ereport(ERROR,`
`4319`	`4299`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`4320`		`-errmsg("cannot begin/end transactions in PL/pgSQL"),`
`4321`		`-errhint("Use a BEGIN block with an EXCEPTION clause instead.")));`
	`4300`	`+errmsg("EXECUTE of transaction commands is not implemented")));`
`4322`	`4301`	`break;`
`4323`	`4302`
`4324`	`4303`	`default:`

`‎src/pl/plpgsql/src/sql/plpgsql_transaction.sql`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -335,13 +335,25 @@ BEGIN`
`335`	`335`	`END;`
`336`	`336`	`$$;`
`337`	`337`
`338`		`--- errorcase`
	`338`	`+-- errorcases`
`339`	`339`	`DO LANGUAGE plpgsql $$`
`340`	`340`	`BEGIN`
`341`	`341`	`SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;`
`342`	`342`	`END;`
`343`	`343`	`$$;`
`344`	`344`
	`345`	`+DO LANGUAGE plpgsql $$`
	`346`	`+BEGIN`
	`347`	`+ SAVEPOINT foo;`
	`348`	`+END;`
	`349`	`+$$;`
	`350`	`+`
	`351`	`+DO LANGUAGE plpgsql $$`
	`352`	`+BEGIN`
	`353`	`+ EXECUTE'COMMIT';`
	`354`	`+END;`
	`355`	`+$$;`
	`356`	`+`
`345`	`357`	`DROPTABLE test1;`
`346`	`358`	`DROPTABLE test2;`
`347`	`359`	`DROPTABLE test3;`

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!

Commitc9301de

File tree

3 files changed

3 files changed

`‎src/pl/plpgsql/src/expected/plpgsql_transaction.out`

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

`‎src/pl/plpgsql/src/sql/plpgsql_transaction.sql`

0 commit comments