Merge pull request pallets-eco#477 from ThiefMaster/no-g

davidism · web-flow · commit ffe562b7a8c3 · 2017-03-11T12:50:23.000-08:00
Move query log back to the app context itself
diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -21,7 +21,7 @@
 from threading import Lock
 
 import sqlalchemy
-from flask import _app_ctx_stack, abort, current_app, g, request
+from flask import _app_ctx_stack, abort, current_app, request
 from flask.signals import Namespace
 from sqlalchemy import event, inspect, orm
 from sqlalchemy.engine.url import make_url
@@ -257,10 +257,12 @@ def after_cursor_execute(
         self, conn, cursor, statement, parameters, context, executemany
     ):
         if current_app:
-            if 'sqlalchemy_queries' not in g:
-                g.sqlalchemy_queries = []
+            try:
+                queries = _app_ctx_stack.top.sqlalchemy_queries
+            except AttributeError:
+                queries = _app_ctx_stack.top.sqlalchemy_queries = []
 
-            g.sqlalchemy_queries.append(_DebugQueryTuple((
+            queries.append(_DebugQueryTuple((
                 statement, parameters, context._query_start_time, _timer(),
                 _calling_context(self.app_package)
             )))
@@ -298,7 +300,7 @@ def get_debug_queries():
         query was issued.  The exact format is undefined so don't try
         to reconstruct filename or function name.
     """
-    return g.get('sqlalchemy_queries', ())
+    return getattr(_app_ctx_stack.top, 'sqlalchemy_queries', [])
 
 
 class Pagination(object):
diff --git a/test_sqlalchemy.py b/test_sqlalchemy.py
@@ -68,16 +68,24 @@ def test_query_recording(self):
         with self.app.test_request_context():
             todo = self.Todo('Test 1', 'test')
             self.db.session.add(todo)
+            self.db.session.flush()
+            todo.done = True
             self.db.session.commit()
 
             queries = fsa.get_debug_queries()
-            self.assertEqual(len(queries), 1)
+            self.assertEqual(len(queries), 2)
             query = queries[0]
             self.assertTrue('insert into' in query.statement.lower())
             self.assertEqual(query.parameters[0], 'Test 1')
             self.assertEqual(query.parameters[1], 'test')
             self.assertTrue('test_sqlalchemy.py' in query.context)
             self.assertTrue('test_query_recording' in query.context)
+            query = queries[1]
+            self.assertTrue('update' in query.statement.lower())
+            self.assertEqual(query.parameters[0], 1)
+            self.assertEqual(query.parameters[1], 1)
+            self.assertTrue('test_sqlalchemy.py' in query.context)
+            self.assertTrue('test_query_recording' in query.context)
 
     def test_helper_api(self):
         self.assertEqual(self.db.metadata, self.db.Model.metadata)
