summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorBas Peschier <bpeschier@fizzgig.nl>2014-08-27 10:41:12 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-08-30 13:27:56 +0200
commiteacf244506d8b7e6dd6483834ea122fec864da85 (patch)
tree7a6889f60a45590b1659faae4a0199178c59fc40 /django
parent6613ea6e3ff2597c04db35ef885562e95c1ef012 (diff)
Converted sql_queries into a lazily evaluated list.
Fixed #23364. Thanks Markush2010 for the report.
Diffstat (limited to 'django')
-rw-r--r--django/core/context_processors.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/django/core/context_processors.py b/django/core/context_processors.py
index ae67ec7211..e5d61fdb16 100644
--- a/django/core/context_processors.py
+++ b/django/core/context_processors.py
@@ -35,12 +35,16 @@ def csrf(request):
def debug(request):
- "Returns context variables helpful for debugging."
+ """
+ Returns context variables helpful for debugging.
+ """
context_extras = {}
if settings.DEBUG and request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
context_extras['debug'] = True
from django.db import connection
- context_extras['sql_queries'] = connection.queries
+ # Return a lazy reference that computes connection.queries on access,
+ # to ensure it contains queries triggered after this function runs.
+ context_extras['sql_queries'] = lazy(lambda: connection.queries, list)
return context_extras