Ticket #1721: session.close.patch

turbogears/database.py

@@ +1 @@
+
 """Provides convenient access to an SQLObject or SQLAlchemy
 managed database."""
 
@@ -403 +404 @@
     req.sa_transaction = make_sa_transaction(session)
 
     try:
-        retval = func(*args, **kw)
+        try:
+            retval = func(*args, **kw)
 
-    except (cherrypy.HTTPRedirect, cherrypy.InternalRedirect):
-        log.debug('this is only a redirect')
-        # If a redirect happens; commit and proceed with redirect
+        except (cherrypy.HTTPRedirect, cherrypy.InternalRedirect):
+            log.debug('this is only a redirect')
+            # If a redirect happens; commit and proceed with redirect
+            if sa_tr_active(req.sa_transaction):
+                req.sa_transaction.commit()
+            raise
+
+        except:
+            log.debug('this is an exception, ROLLBACK now!')
+            # If any other exception happens; rollback and re-raise error
+            if sa_tr_active(req.sa_transaction):
+                req.sa_transaction.rollback()
+            raise
+
+        # If the call was successful; commit and proceed
         if sa_tr_active(req.sa_transaction):
+            log.debug('The transaction was successful, COMMIT now!')
             req.sa_transaction.commit()
-        raise
+    finally:
+        # With SA 0.4, always close the session
+        if not hasattr(session, 'context'):
+            session.close()
 
-    except:
-        log.debug('this is an exception, ROLLBACK now!')
-        # If any other exception happens; rollback and re-raise error
-        if sa_tr_active(req.sa_transaction):
-            req.sa_transaction.rollback()
-        raise
-
-    # If the call was successful; commit and proceed
-    if sa_tr_active(req.sa_transaction):
-        log.debug('The transaction was successful, COMMIT now!')
-        req.sa_transaction.commit()
-
     return retval
 
 # include "args" to avoid call being pre-cached
@@ -441 +447 @@
         # SA 0.3
         return tr.session.transaction
     else:
-        # SA 0.4 (effectively always active - commit or rollback don't fail)
+        # SA 0.4 can be treated as always active; if no transaction
+        # is active, commit and rollback quietly do nothing
         return True
 
 def make_sa_transaction(session):