Merge commit 'rob/master'

1 files changed, 22 insertions, 0 deletions

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 0c8e9c3..f05ea97 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -4,6 +4,7 @@
 		<tr>
 			<th>Time&nbsp;(ms)</th>
 			<th>Action</th>
+			<th>Stacktrace</th>
 			<th>Query</th>
 		</tr>
 	</thead>
@@ -20,6 +21,27 @@
 					{% endif %}
 				{% endif %}
 				</td>
+				<td>
+					{% if query.stacktrace %}
+					<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
+					<div class="djSQLHideStacktraceDiv" style="display:none;">
+						<table>
+							<tr>
+								<th>Line</th>
+								<th>Method</th>
+								<th>File</th>
+							</tr>
+							{% for file, line, method in query.stacktrace %}
+								<tr>
+									<td>{{ line }}</td>
+									<td><pre>{{ method|escape }}<pre></td>
+									<td><pre>{{ file|escape }}</pre></td>
+								</tr>
+							{% endfor %}
+						</table>
+					</div>
+					{% endif %}
+				</td>
 				<td class="syntax">{{ query.sql|safe }}</td>
 			</tr>
 		{% endfor %}