Skip to content

Commit 7093210

Browse files
living180tim-schilling
authored andcommitted
Post-process two query attributes
There is no reason for them to be computed when recording, so move them to SQLPanel.generate_stats().
1 parent c387acf commit 7093210

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

debug_toolbar/panels/sql/panel.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from django.urls import path
77
from django.utils.translation import gettext_lazy as _, ngettext
88

9+
from debug_toolbar import settings as dt_settings
910
from debug_toolbar.forms import SignedDataForm
1011
from debug_toolbar.panels import Panel
1112
from debug_toolbar.panels.sql import views
@@ -204,6 +205,8 @@ def generate_stats(self, request, response):
204205
duplicate_query_groups = defaultdict(list)
205206

206207
if self._queries:
208+
sql_warning_threshold = dt_settings.get_config()["SQL_WARNING_THRESHOLD"]
209+
207210
width_ratio_tally = 0
208211
factor = int(256.0 / (len(self._databases) * 2.5))
209212
for n, db in enumerate(self._databases.values()):
@@ -261,6 +264,12 @@ def generate_stats(self, request, response):
261264

262265
if query["sql"]:
263266
query["sql"] = reformat_sql(query["sql"], with_toggle=True)
267+
268+
query["is_slow"] = query["duration"] > sql_warning_threshold
269+
query["is_select"] = (
270+
query["raw_sql"].lower().lstrip().startswith("select")
271+
)
272+
264273
query["rgb_color"] = self._databases[alias]["rgb_color"]
265274
try:
266275
query["width_ratio"] = (query["duration"] / self._sql_time) * 100

debug_toolbar/panels/sql/tracking.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from django.db.backends.utils import CursorWrapper
88
from django.utils.encoding import force_str
99

10-
from debug_toolbar import settings as dt_settings
1110
from debug_toolbar.utils import get_stack_trace, get_template_info
1211

1312
try:
@@ -191,10 +190,6 @@ def _record(self, method, sql, params):
191190
"params": _params,
192191
"raw_params": params,
193192
"stacktrace": get_stack_trace(skip=2),
194-
"is_slow": (
195-
duration > dt_settings.get_config()["SQL_WARNING_THRESHOLD"]
196-
),
197-
"is_select": sql.lower().strip().startswith("select"),
198193
"template_info": template_info,
199194
}
200195

0 commit comments

Comments
 (0)