From: Tom Lane Date: Fri, 10 Jun 2022 20:34:25 +0000 (-0400) Subject: Revert "Fix psql's single transaction mode on client-side errors with -c/-f switches". X-Git-Tag: REL_10_22~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db713aa7fcbe2ad2a5dae7f76c309f70ec424ad7;p=thirdparty%2Fpostgresql.git Revert "Fix psql's single transaction mode on client-side errors with -c/-f switches". This reverts commits a04ccf6df et al. in the back branches only. There was some disagreement already over whether to back-patch 157f8739a, on the grounds that it is the sort of behavioral change that we don't like to back-patch. Furthermore, it now looks like the logic needs some more work, which we don't have time for before the upcoming 14.4 release. Revert for now, and perhaps reconsider later. Discussion: https://postgr.es/m/17504-76b68018e130415e@postgresql.org --- diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 7b52ac19002..844d7e27666 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -580,10 +580,8 @@ EOF psql to issue a BEGIN command before the first such option and a COMMIT command after the last one, thereby wrapping all the commands into a single - transaction. If any of the commands fails, a - ROLLBACK command is sent instead. This ensures that - either all the commands complete successfully, or no changes are - applied. + transaction. This ensures that either all the commands complete + successfully, or no changes are applied. diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 36e9432fc67..260b4ea55cd 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -371,9 +371,7 @@ main(int argc, char *argv[]) if (options.single_txn) { - res = PSQLexec((successResult == EXIT_SUCCESS) ? - "COMMIT" : "ROLLBACK"); - if (res == NULL) + if ((res = PSQLexec("COMMIT")) == NULL) { if (pset.on_error_stop) {