teardown_request support for flask-sqlalchemy

pallets-eco · Jun 24, 2011 · 8d28185 · 8d28185
1 parent 421a1c2
commit 8d28185
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/flaskext/sqlalchemy.py b/flaskext/sqlalchemy.py
@@ -641,7 +641,15 @@ def init_app(self, app):
             app.extensions = {}
         app.extensions['sqlalchemy'] = _SQLAlchemyState(self, app)
 
-        @app.after_request
+        # 0.7 introduced the new `teardown_request` decorator which has better
+        # semantics than the after_request one.  We should use it if
+        # available.
+        if hasattr(app, 'teardown_request'):
+            teardown = app.teardown_request
+        else:
+            teardown = app.after_request
+
+        @teardown
         def shutdown_session(response):
             self.session.remove()
             return response