summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2021-01-16 01:14:54 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2021-01-16 01:14:54 +0000
commit3e40a232a025b770488c9d4940d284e3f7cdba24 (patch)
treee0e27acfd811e3d05b6873e94a4a3d99a78c4352 /lib/sqlalchemy/engine/base.py
parentf898ef162da65a3755d25ee194885677c880c91f (diff)
parentc5b4af959e13f8214121f62f322c668bb178d41f (diff)
downloadsqlalchemy-3e40a232a025b770488c9d4940d284e3f7cdba24.tar.gz
Merge "Guard against re-entrant autobegin in Core, ORM"
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 72d66b7c8..31bf885db 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -813,10 +813,11 @@ class Connection(Connectable):
if self._echo:
self.engine.logger.info("BEGIN (implicit)")
+ self.__in_begin = True
+
if self._has_events or self.engine._has_events:
self.dispatch.begin(self)
- self.__in_begin = True
try:
self.engine.dialect.do_begin(self.connection)
except BaseException as e: