diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-09 10:04:23 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-09 10:04:23 -0500 |
| commit | 6e4515948f87a2299461003c709393b68453d2d0 (patch) | |
| tree | 9fad0361163f5c0e8670fae9fabb6183266e4bae /lib/sqlalchemy/engine/threadlocal.py | |
| parent | 2cbf1e590f87df848a42c18aa17e0dfb12443852 (diff) | |
| download | sqlalchemy-6e4515948f87a2299461003c709393b68453d2d0.tar.gz | |
- further fixes to no trans in progress, no trans ever for TLEngine, [ticket:1998]
Diffstat (limited to 'lib/sqlalchemy/engine/threadlocal.py')
| -rw-r--r-- | lib/sqlalchemy/engine/threadlocal.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py index 6b222680c..adcce08c6 100644 --- a/lib/sqlalchemy/engine/threadlocal.py +++ b/lib/sqlalchemy/engine/threadlocal.py @@ -77,18 +77,21 @@ class TLEngine(base.Engine): self._connections.trans.append(self.contextual_connect().begin()) def prepare(self): - if not self._connections.trans: + if not hasattr(self._connections, 'trans') or \ + not self._connections.trans: return self._connections.trans[-1].prepare() def commit(self): - if not self._connections.trans: + if not hasattr(self._connections, 'trans') or \ + not self._connections.trans: return trans = self._connections.trans.pop(-1) trans.commit() def rollback(self): - if not self._connections.trans: + if not hasattr(self._connections, 'trans') or \ + not self._connections.trans: return trans = self._connections.trans.pop(-1) trans.rollback() |