From 8df4dc438583cb3a6b7bb67ce86d8264d4ee4282 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 8 Dec 2010 13:46:29 -0500 Subject: - Threadlocal engine methods rollback(), commit(), prepare() won't raise if no transaction is in progress; this was a regression introduced in 0.6. [ticket:1998] --- lib/sqlalchemy/engine/threadlocal.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py index b6fa14af7..6b222680c 100644 --- a/lib/sqlalchemy/engine/threadlocal.py +++ b/lib/sqlalchemy/engine/threadlocal.py @@ -77,16 +77,22 @@ class TLEngine(base.Engine): self._connections.trans.append(self.contextual_connect().begin()) def prepare(self): + if not self._connections.trans: + return self._connections.trans[-1].prepare() def commit(self): + if not self._connections.trans: + return trans = self._connections.trans.pop(-1) trans.commit() def rollback(self): + if not self._connections.trans: + return trans = self._connections.trans.pop(-1) trans.rollback() - + def dispose(self): self._connections = util.threading.local() super(TLEngine, self).dispose() -- cgit v1.2.1