diff options
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 449f386ce..3a0cfbbe9 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1281,42 +1281,43 @@ class Connection(Connectable): self.dialect.do_execute( cursor, statement, parameters, context ) - except BaseException as e: - self._handle_dbapi_exception( - e, statement, parameters, cursor, context - ) - if self._has_events or self.engine._has_events: - self.dispatch.after_cursor_execute( - self, - cursor, - statement, - parameters, - context, - context.executemany, - ) + if self._has_events or self.engine._has_events: + self.dispatch.after_cursor_execute( + self, + cursor, + statement, + parameters, + context, + context.executemany, + ) - if context.compiled: - context.post_exec() + if context.compiled: + context.post_exec() - result = context._setup_result_proxy() + result = context._setup_result_proxy() - if context.should_autocommit and self._root.__transaction is None: - self._root._commit_impl(autocommit=True) + if context.should_autocommit and self._root.__transaction is None: + self._root._commit_impl(autocommit=True) - # for "connectionless" execution, we have to close this - # Connection after the statement is complete. - if self.should_close_with_result: - assert not context._is_future_result + # for "connectionless" execution, we have to close this + # Connection after the statement is complete. + if self.should_close_with_result: + assert not context._is_future_result + + # ResultProxy already exhausted rows / has no rows. + # close us now + if result._soft_closed: + self.close() + else: + # ResultProxy will close this Connection when no more + # rows to fetch. + result._autoclose_connection = True + except BaseException as e: + self._handle_dbapi_exception( + e, statement, parameters, cursor, context + ) - # ResultProxy already exhausted rows / has no rows. - # close us now - if result._soft_closed: - self.close() - else: - # ResultProxy will close this Connection when no more - # rows to fetch. - result._autoclose_connection = True return result def _cursor_execute(self, cursor, statement, parameters, context=None): |