Merge branch 'issue-duplicated-queries' of https://github.com/thinred/django-debug-toolbar into thinred-issue-duplicated-queries

1 files changed, 15 insertions, 1 deletions

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 79a4871..5c20fcd 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -6,7 +6,9 @@ from django.conf import settings
 from django.template.context import get_standard_processors
 from django.test.signals import template_rendered
 from django.utils.translation import ugettext_lazy as _
+from django.db.models.query import QuerySet
 from debug_toolbar.panels import DebugPanel
+from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered
 
 # Code taken and adapted from Simon Willison and Django Snippets:
 # http://www.djangosnippets.org/snippets/766/
@@ -68,8 +70,20 @@ class TemplateDebugPanel(DebugPanel):
                     # Replace LANGUAGES, which is available in i18n context processor
                     elif key == 'LANGUAGES' and isinstance(value, tuple):
                         temp_layer[key] = '<<languages>>'
+                    # QuerySet would trigger the database: user can run the query from SQL Panel
+                    elif isinstance(value, QuerySet):
+                        model_name = "%s.%s" % (value.model._meta.app_label, value.model.__name__)
+                        temp_layer[key] = '<<queryset of %s>>' % model_name
                     else:
-                        temp_layer[key] = value
+                        try:
+                            recording(False)
+                            pformat(value)  # this MAY trigger a db query
+                        except SQLQueryTriggered:
+                            temp_layer[key] = '<<triggers database query>>'
+                        else:
+                            temp_layer[key] = value
+                        finally:
+                            recording(True)
             try:
                 context_list.append(pformat(temp_layer))
             except UnicodeEncodeError: