NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf25b551

committed

Revert "Fix psql's single transaction mode on client-side errors with -c/-f switches".

This reverts commitsa04ccf6 et al. in the back branches only.There was some disagreement already over whether to back-patch157f873, on the grounds that it is the sort of behavioralchange that we don't like to back-patch. Furthermore, it nowlooks like the logic needs some more work, which we don't havetime for before the upcoming 14.4 release. Revert for now, andperhaps reconsider later.Discussion:https://postgr.es/m/17504-76b68018e130415e@postgresql.org

1 parent03fa84a commitf25b551Copy full SHA for f25b551

File tree

2 files changed

-7

lines changed

doc/src/sgml/ref
- psql-ref.sgml
src/bin/psql
- startup.c

2 files changed

-7

lines changed

`‎doc/src/sgml/ref/psql-ref.sgml`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -591,10 +591,8 @@ EOF`
`591`	`591`	`<application>psql</application> to issue a <command>BEGIN</command> command`
`592`	`592`	`before the first such option and a <command>COMMIT</command> command after`
`593`	`593`	`the last one, thereby wrapping all the commands into a single`
`594`		`- transaction. If any of the commands fails, a`
`595`		`- <command>ROLLBACK</command> command is sent instead. This ensures that`
`596`		`- either all the commands complete successfully, or no changes are`
`597`		`- applied.`
	`594`	`+ transaction. This ensures that either all the commands complete`
	`595`	`+ successfully, or no changes are applied.`
`598`	`596`	`</para>`
`599`	`597`
`600`	`598`	`<para>`

`‎src/bin/psql/startup.c`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,9 +411,7 @@ main(int argc, char *argv[])`
`411`	`411`
`412`	`412`	`if (options.single_txn)`
`413`	`413`	`{`
`414`		`-res=PSQLexec((successResult==EXIT_SUCCESS) ?`
`415`		`-"COMMIT" :"ROLLBACK");`
`416`		`-if (res==NULL)`
	`414`	`+if ((res=PSQLexec("COMMIT"))==NULL)`
`417`	`415`	`{`
`418`	`416`	`if (pset.on_error_stop)`
`419`	`417`	`{`

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!

Commitf25b551

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/psql-ref.sgml`

`‎src/bin/psql/startup.c`

0 commit comments