summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql/psycopg.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/psycopg.py')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg.py b/lib/sqlalchemy/dialects/postgresql/psycopg.py
index 9207221df..b811d1cab 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg.py
@@ -385,12 +385,14 @@ class PGDialect_psycopg(_PGDialect_common_psycopg):
!= self._psycopg_TransactionStatus.IDLE
):
dbapi_conn.rollback()
- before = dbapi_conn.autocommit
+ before_autocommit = dbapi_conn.autocommit
try:
- self._do_autocommit(dbapi_conn, True)
+ if not before_autocommit:
+ self._do_autocommit(dbapi_conn, True)
dbapi_conn.execute(command)
finally:
- self._do_autocommit(dbapi_conn, before)
+ if not before_autocommit:
+ self._do_autocommit(dbapi_conn, before_autocommit)
def do_rollback_twophase(
self, connection, xid, is_prepared=True, recover=False