Ticket #5225: debug.patch

data/django/django/views/debug.py

@@ -3 +3 @@
 from django.utils.html import escape
 from django.http import HttpResponseServerError, HttpResponseNotFound
 from django.utils.encoding import smart_unicode
+from django.db import connection
 import os, re, sys
 
 HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST')
@@ -147 +148 @@
         'template_info': template_info,
         'template_does_not_exist': template_does_not_exist,
         'loader_debug_info': loader_debug_info,
+        'queries':connection.queries
     })
     return HttpResponseServerError(t.render(c), mimetype='text/html')
 
@@ -170 +172 @@
         'request': request,
         'request_protocol': request.is_secure() and "https" or "http",
         'settings': get_safe_settings(),
+        'queries':connection.queries
     })
     return HttpResponseNotFound(t.render(c), mimetype='text/html')
 
@@ -585 +588 @@
     </tbody>
   </table>
 
+  <h3 id="query-info">Queries</h3>
+  {% if queries %}
+    <table class="req">
+      <thead>
+        <tr>
+          <th>Time</th>
+          <th>Sql</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for query in queries %}
+          <tr>
+            <td>{{ query.time }}</td>
+            <td class="code"><div>{{ query.sql }}</div></td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% else %}
+    <p>No query data</p>
+  {% endif %}
+
 </div>
 
 <div id="explanation">
@@ -653 +678 @@
     {% else %}
       <p>{{ reason|escape }}</p>
     {% endif %}
+    {% if queries %}
+      <p align="center">***</p>
+      <h3>Queries</h3>
+      {% for query in queries %}
+            <p>{{ query.sql }}</p>
+        {% endfor %}
+    {% endif %}
   </div>
 
   <div id="explanation">