diff options
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/strategies.py | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index c07c83a07..90d6bda86 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1962,7 +1962,7 @@ def _listener_connection_cls(cls, dispatch): _savepoint_impl(name=name) def _rollback_to_savepoint_impl(self, name, context): - for fn in dispatch.on_rollback_to_savepoint: + for fn in dispatch.on_rollback_savepoint: fn(self, name, context) return super(EventListenerConnection, self).\ _rollback_to_savepoint_impl(name, context) @@ -1989,13 +1989,13 @@ def _listener_connection_cls(cls, dispatch): for fn in dispatch.on_rollback_twophase: fn(self, xid) return super(EventListenerConnection, self).\ - _rollback_twophase_impl(xid) + _rollback_twophase_impl(xid, is_prepared) def _commit_twophase_impl(self, xid, is_prepared): for fn in dispatch.on_commit_twophase: - fn(self, xid) + fn(self, xid, is_prepared) return super(EventListenerConnection, self).\ - _commit_twophase_impl(xid) + _commit_twophase_impl(xid, is_prepared) return EventListenerConnection diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py index 1ef3ae624..fe0abd4b7 100644 --- a/lib/sqlalchemy/engine/strategies.py +++ b/lib/sqlalchemy/engine/strategies.py @@ -94,6 +94,7 @@ class DefaultEngineStrategy(EngineStrategy): 'echo': 'echo_pool', 'timeout': 'pool_timeout', 'recycle': 'pool_recycle', + 'events':'pool_events', 'use_threadlocal':'pool_threadlocal'} for k in util.get_cls_kwargs(poolclass): tk = translate.get(k, k) |