Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3f7f067

Browse files
committed
Revert "Fix psql's single transaction mode on client-side errors with -c/-f switches".
This reverts commits a04ccf6 et al. in the back branches only. There was some disagreement already over whether to back-patch 157f873, 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
1 parent 254cd7f commit 3f7f067

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,8 @@ EOF
591591
<application>psql</application> to issue a <command>BEGIN</command> command
592592
before the first such option and a <command>COMMIT</command> command after
593593
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.
598596
</para>
599597

600598
<para>

src/bin/psql/startup.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,7 @@ main(int argc, char *argv[])
412412

413413
if (options.single_txn)
414414
{
415-
res = PSQLexec((successResult == EXIT_SUCCESS) ?
416-
"COMMIT" : "ROLLBACK");
417-
if (res == NULL)
415+
if ((res = PSQLexec("COMMIT")) == NULL)
418416
{
419417
if (pset.on_error_stop)
420418
{

0 commit comments

Comments
 (0)