diff options
| author | Michael Paquier <michael@paquier.xyz> | 2022-06-15 11:24:52 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2022-06-15 11:24:52 +0900 |
| commit | a3ff08e0b08dbfeb777ccfa8f13ebaa95d064c04 (patch) | |
| tree | a7c3e67cf0f3e7f796063531d762c5e3fa803666 /src/bin/psql/startup.c | |
| parent | ba412c905af14699a128a7bcd8ce5234adb93ceb (diff) | |
Tweak behavior of psql --single-transaction depending on ON_ERROR_STOP
This commit, in completion of 157f873, forces a ROLLBACK for
--single-transaction only when ON_ERROR_STOP is used when one of the
steps defined by -f/-c fails. Hence, COMMIT is always used when
ON_ERROR_STOP is not set, ignoring the status code of the last action
taken in the set of switches specified by -c/-f (previously ROLLBACK
would have been issued even without ON_ERROR_STOP if the last step
failed, while COMMIT was issued if a step in-between failed as long as
the last step succeeded, leading to more inconsistency).
While on it, this adds much more test coverage in this area when not
using ON_ERROR_STOP with multiple switch patterns involving -c and -f
for query files, single queries and slash commands.
The behavior of ON_ERROR_STOP is arguably a bug, but there was no much
support for a backpatch to force a ROLLBACK on a step failure, so this
change is done only on HEAD for now.
Per discussion with Tom Lane and Kyotaro Horiguchi.
Discussion: https://postgr.es/m/Yqbc8bAdwnP02na4@paquier.xyz
Diffstat (limited to 'src/bin/psql/startup.c')
| -rw-r--r-- | src/bin/psql/startup.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 574f49d4c9b..7c2f555f15c 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -426,8 +426,13 @@ main(int argc, char *argv[]) if (options.single_txn) { - res = PSQLexec((successResult == EXIT_SUCCESS) ? - "COMMIT" : "ROLLBACK"); + /* + * Rollback the contents of the single transaction if the caller + * has set ON_ERROR_STOP and one of the steps has failed. This + * check needs to match the one done a couple of lines above. + */ + res = PSQLexec((successResult != EXIT_SUCCESS && pset.on_error_stop) ? + "ROLLBACK" : "COMMIT"); if (res == NULL) { if (pset.on_error_stop) |