mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-02 19:16:54 +02:00
Fix psql's single transaction mode on client-side errors with -c/-f switches
psql --single-transaction is able to handle multiple -c and -f switches
in a single transaction since d5563d7d
, 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
This commit is contained in:
parent
668656d52f
commit
b0bd9327dd
@ -582,8 +582,10 @@ EOF
|
|||||||
<application>psql</application> to issue a <command>BEGIN</command> command
|
<application>psql</application> to issue a <command>BEGIN</command> command
|
||||||
before the first such option and a <command>COMMIT</command> command after
|
before the first such option and a <command>COMMIT</command> command after
|
||||||
the last one, thereby wrapping all the commands into a single
|
the last one, thereby wrapping all the commands into a single
|
||||||
transaction. This ensures that either all the commands complete
|
transaction. If any of the commands fails, a
|
||||||
successfully, or no changes are applied.
|
<command>ROLLBACK</command> command is sent instead. This ensures that
|
||||||
|
either all the commands complete successfully, or no changes are
|
||||||
|
applied.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
|
@ -386,7 +386,9 @@ main(int argc, char *argv[])
|
|||||||
|
|
||||||
if (options.single_txn)
|
if (options.single_txn)
|
||||||
{
|
{
|
||||||
if ((res = PSQLexec("COMMIT")) == NULL)
|
res = PSQLexec((successResult == EXIT_SUCCESS) ?
|
||||||
|
"COMMIT" : "ROLLBACK");
|
||||||
|
if (res == NULL)
|
||||||
{
|
{
|
||||||
if (pset.on_error_stop)
|
if (pset.on_error_stop)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user