mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix interaction between psql \set AUTOCOMMIT and "ON_ERROR_ROLLBACK"

Browse Source 
by properly updating transaction state after AUTOCOMMIT.
This commit is contained in:
Bruce Momjian 2005-09-20 21:43:08 +00:00
parent 8d86982a11
commit 99bb9c551e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/psql/common.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2005, PostgreSQL Global Development Group * Copyright (c) 2000-2005, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.104 2005/06/22 21:14:30 tgl Exp $ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.105 2005/09/20 21:43:08 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "common.h" #include "common.h"
@ -1010,13 +1010,15 @@ SendQuery(const char *query)
return false; return false;
} }
PQclear(results); PQclear(results);
transaction_status = PQtransactionStatus(pset.db);
} }
else if (transaction_status == PQTRANS_INTRANS &&
(rollback_str = GetVariable(pset.vars, "ON_ERROR_ROLLBACK")) != NULL && if (transaction_status == PQTRANS_INTRANS &&
/* !off and !interactive is 'on' */ (rollback_str = GetVariable(pset.vars, "ON_ERROR_ROLLBACK")) != NULL &&
pg_strcasecmp(rollback_str, "off") != 0 && /* !off and !interactive is 'on' */
(pset.cur_cmd_interactive || pg_strcasecmp(rollback_str, "off") != 0 &&
pg_strcasecmp(rollback_str, "interactive") != 0)) (pset.cur_cmd_interactive ||
pg_strcasecmp(rollback_str, "interactive") != 0))
{ {
if (on_error_rollback_warning == false && pset.sversion < 80000) if (on_error_rollback_warning == false && pset.sversion < 80000)
{ {