Skip to content

Commit 0ed1538

Browse files
committed
Merge pull request #721 from ewjoachim/duplicate_sql_colors
Adding a color information to distinguish duplicate queries
2 parents 4c47583 + 61ff514 commit 0ed1538

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

debug_toolbar/panels/sql/panel.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,10 @@ def generate_stats(self, request, response):
211211

212212
# Queries are duplicates only if there's as least 2 of them.
213213
# Also, to hide queries, we need to give all the duplicate groups an id
214+
query_colors = contrasting_color_generator()
214215
query_duplicates = dict(
215216
(alias, dict(
216-
(query, duplicate_count)
217+
(query, (duplicate_count, next(query_colors)))
217218
for query, duplicate_count in queries.items()
218219
if duplicate_count >= 2
219220
))
@@ -222,14 +223,15 @@ def generate_stats(self, request, response):
222223

223224
for alias, query in self._queries:
224225
try:
225-
duplicates_count = query_duplicates[alias][query["raw_sql"]]
226+
duplicates_count, color = query_duplicates[alias][query["raw_sql"]]
226227
query["duplicate_count"] = duplicates_count
228+
query["duplicate_color"] = color
227229
except KeyError:
228230
pass
229231

230232
for alias, alias_info in self._databases.items():
231233
try:
232-
alias_info["duplicate_count"] = sum(e for e in query_duplicates[alias].values())
234+
alias_info["duplicate_count"] = sum(e[0] for e in query_duplicates[alias].values())
233235
except KeyError:
234236
pass
235237

debug_toolbar/templates/debug_toolbar/panels/sql.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<div class="djDebugSql">{{ query.sql|safe }}</div>
3737
</div>
3838
{% if query.duplicate_count %}
39-
<strong>{% blocktrans with dupes=query.duplicate_count %}Duplicated {{ dupes }} times.{% endblocktrans %}
39+
<strong>
40+
<span data-background-color="{{ query.duplicate_color }}">&#160;</span>
41+
{% blocktrans with dupes=query.duplicate_count %}Duplicated {{ dupes }} times.{% endblocktrans %}
4042
</strong>
4143
{% endif %}
4244
</td>

0 commit comments

Comments
 (0)