summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/future/engine.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-05-17 22:00:16 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-05-17 22:00:16 +0000
commitde1fd55af4ef352ebbc95e03d868aab2995a8261 (patch)
tree933eb013da54548e2ee329eb20080af8a838d4be /lib/sqlalchemy/future/engine.py
parent0d611b88911217727a174916b83e296e8c7105b1 (diff)
parent0e53221eef50b3274841fbd1eb41e32f5dfc4e69 (diff)
downloadsqlalchemy-de1fd55af4ef352ebbc95e03d868aab2995a8261.tar.gz
Merge "Update transaction / connection handling"
Diffstat (limited to 'lib/sqlalchemy/future/engine.py')
-rw-r--r--lib/sqlalchemy/future/engine.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/sqlalchemy/future/engine.py b/lib/sqlalchemy/future/engine.py
index b96716978..d3b13b510 100644
--- a/lib/sqlalchemy/future/engine.py
+++ b/lib/sqlalchemy/future/engine.py
@@ -249,25 +249,7 @@ class Connection(_LegacyConnection):
if any transaction is in place.
"""
-
- try:
- conn = self.__connection
- except AttributeError:
- pass
- else:
- # TODO: can we do away with "_reset_agent" stuff now?
- if self._transaction:
- self._transaction.rollback()
-
- conn.close()
-
- # the close() process can end up invalidating us,
- # as the pool will call our transaction as the "reset_agent"
- # for rollback(), which can then cause an invalidation
- if not self.__invalid:
- del self.__connection
- self.__can_reconnect = False
- self._transaction = None
+ super(Connection, self).close()
def execute(self, statement, parameters=None, execution_options=None):
r"""Executes a SQL statement construct and returns a