- 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]

1 files changed, 7 insertions, 1 deletions

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()