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