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

michaelpq · michaelpq · commit c3df4d53ca4a · 2022-06-06T11:07:39.000+09:00
psql --single-transaction is able to handle multiple -c and -f switches in a single transaction since d5563d7, but this had the surprising behavior of forcing a transaction COMMIT even if psql failed with an error in the client (for example incorrect path given to \copy), which would generate an error, but still commit any changes that were already applied in the backend. This commit makes the behavior more consistent, by enforcing a transaction ROLLBACK if any commands fail, both client-side and backend-side, so as no changes are applied if one error happens in any of them. Some tests are added on HEAD to provide some coverage about all that. Backend-side errors are unreliable as IPC::Run can complain on SIGPIPE if psql quits before reading a query result, but that should work properly in the case where any errors come from psql itself, which is what the original report is about. Reported-by: Christoph Berg Author: Kyotaro Horiguchi, Michael Paquier Discussion: https://postgr.es/m/17504-76b68018e130415e@postgresql.org Backpatch-through: 10
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
@@ -580,8 +580,10 @@ EOF
         <application>psql</application> to issue a <command>BEGIN</> command
         before the first such option and a <command>COMMIT</> command after
         the last one, thereby wrapping all the commands into a single
-        transaction.  This ensures that either all the commands complete
-        successfully, or no changes are applied.
+        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.
        </para>
 
        <para>
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -371,7 +371,9 @@ main(int argc, char *argv[])
 
 		if (options.single_txn)
 		{
-			if ((res = PSQLexec("COMMIT")) == NULL)
+			res = PSQLexec((successResult == EXIT_SUCCESS) ?
+						   "COMMIT" : "ROLLBACK");
+			if (res == NULL)
 			{
 				if (pset.on_error_stop)
 				{

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,9 @@ main(int argc, char *argv[])`
`371`	`371`
`372`	`372`	`if (options.single_txn)`
`373`	`373`	`{`
`374`		`- if ((res = PSQLexec("COMMIT")) == NULL)`
	`374`	`+ res = PSQLexec((successResult == EXIT_SUCCESS) ?`
	`375`	`+ "COMMIT" : "ROLLBACK");`
	`376`	`+ if (res == NULL)`
`375`	`377`	`{`
`376`	`378`	`if (pset.on_error_stop)`
`377`	`379`	`{`