diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-14 15:50:40 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-14 15:50:40 +0000 |
| commit | 53faada96c484b11b7a4632dc061dbce3661dbbe (patch) | |
| tree | 0207994aee90b7f9fcff16d30fb3f365e0b45bb3 /lib/sqlalchemy/engine/base.py | |
| parent | 0642dcb796313118dd81c3d12e044b4128c2746d (diff) | |
| download | sqlalchemy-53faada96c484b11b7a4632dc061dbce3661dbbe.tar.gz | |
fixed nested rollbacks
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index dafef729a..d9e3f4ed8 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -361,7 +361,7 @@ class Transaction(object): is_active = property(lambda s:s.__is_active) def rollback(self): if not self.__parent.__is_active: - raise exceptions.InvalidRequestError("This transaction is inactive") + return if self.__parent is self: self.__connection._rollback_impl() self.__is_active = False |