summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-07-12 19:34:25 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-07-12 19:34:25 -0400
commit7bb2adfff90f989d45cbcb6f306d8d9d82298816 (patch)
tree7f766981e8c908bfa1bf1a5d07b00b4a6998f53b /lib/sqlalchemy/engine/base.py
parentf5023ceef3858a4ebbef8d401d10f6493e773b75 (diff)
downloadsqlalchemy-7bb2adfff90f989d45cbcb6f306d8d9d82298816.tar.gz
- Context manager provided by Connection.begin()
will issue rollback() if the commit() fails, not just if an exception occurs.
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 3cfe80081..04c14c2b7 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1979,11 +1979,14 @@ class Transaction(object):
def __exit__(self, type, value, traceback):
if type is None and self.is_active:
- self.commit()
+ try:
+ self.commit()
+ except:
+ self.rollback()
+ raise
else:
self.rollback()
-
class RootTransaction(Transaction):
def __init__(self, connection):
super(RootTransaction, self).__init__(connection, None)