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 e522113ab2ac74af8ab4d0526dcf9d4baaf540e9..d14f0581e60580b00373be658801c708be9bbfac 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -591,10 +591,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 9aa665d32584cf981a5ed743ec1170dfc6b64124..110906a4e959b46d4540f6c78580bdde77d3e950 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -411,9 +411,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)
                {