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

tglsfdc · tglsfdc · commit 030da9b6fd52 · 2022-06-10T16:34:25.000-04:00
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
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
@@ -592,10 +592,8 @@ EOF
         <application>psql</application> to issue a <command>BEGIN</command> command
         before the first such option and a <command>COMMIT</command> command after
         the last one, thereby wrapping all the commands into a single
-        transaction. If any of the commands fails, a
-        <command>ROLLBACK</command> 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.
        </para>
 
        <para>
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -416,9 +416,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)
 				{

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