Better substitutions for template context variables triggering SQL queries

Author: kmike

debug_toolbar/panels/template.py

@@ -70,13 +70,14 @@ def _store_template_info(self, sender, **kwargs):
                         temp_layer[key] = '<<languages>>'
                     # QuerySet would trigger the database: user can run the query from SQL Panel
                     elif isinstance(value, QuerySet):
-                        temp_layer[key] = '<<queryset>>'
+                        model_name = "%s.%s" % (value.model._meta.app_label, value.model.__name__)
+                        temp_layer[key] = '<<queryset of %s>>' % model_name
                     else:
                         try:
                             recording(False)
                             pformat(value)  # this MAY trigger a db query
                         except SQLQueryTriggered:
-                            temp_layer[key] = '<<contains queryset>>'
+                            temp_layer[key] = '<<triggers database query>>'
                         else:
                             temp_layer[key] = value
                         finally:

tests/tests.py

@@ -207,8 +207,8 @@ def test_queryset_hook(self):
         self.assertEquals(len(sql_panel._queries), 0)
         ctx = template_panel.templates[0]['context'][0]
         ctx = eval(ctx) # convert back to Python
-        self.assertEquals(ctx['queryset'], '<<queryset>>')
-        self.assertEquals(ctx['deep_queryset'], '<<contains queryset>>')
+        self.assertEquals(ctx['queryset'], '<<queryset of auth.User>>')
+        self.assertEquals(ctx['deep_queryset'], '<<triggers database query>>')
 
 def module_func(*args, **kwargs):
     """Used by dispatch tests"""