diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-11-04 17:15:36 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-11-04 17:15:36 +0000 |
| commit | a69a094db57ab1c6220930274a96457b0c353221 (patch) | |
| tree | 72ff0f5c788ddd15d38df5f60db25b9baf538302 /lib/sqlalchemy/engine/base.py | |
| parent | 43348d6163959217c6b6d4d0818e3a261a359285 (diff) | |
| download | sqlalchemy-a69a094db57ab1c6220930274a96457b0c353221.tar.gz | |
- Fixed bug in two-phase transaction whereby commit() method
didn't set the full state which allows subsequent close()
call to succeed. [ticket:1603]
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 33a30201f..b65843f48 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1204,7 +1204,6 @@ class Transaction(object): This is used to cancel a Transaction without affecting the scope of an enclosing transaction. """ - if not self._parent.is_active: return if self._parent is self: @@ -1278,7 +1277,7 @@ class TwoPhaseTransaction(Transaction): def _do_rollback(self): self.connection._rollback_twophase_impl(self.xid, self._is_prepared) - def commit(self): + def _do_commit(self): self.connection._commit_twophase_impl(self.xid, self._is_prepared) |