Skip to content

Commit 140dd68

Browse files
kkm-horikawaclaude
andcommitted
Remove SQLParseError handling per review feedback
Split SQLParseError exception handling into a separate PR as requested. This PR now focuses solely on the SQL_PRETTIFY_MAX_LENGTH setting. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 5da93da commit 140dd68

1 file changed

Lines changed: 4 additions & 23 deletions

File tree

debug_toolbar/panels/sql/utils.py

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88

99
from debug_toolbar import settings as dt_settings
1010

11-
# Import SQLParseError for graceful exception handling
12-
try:
13-
from sqlparse.exceptions import SQLParseError
14-
except ImportError:
15-
# Older sqlparse versions don't have this exception
16-
SQLParseError = None
17-
1811

1912
class ElideSelectListsFilter:
2013
"""sqlparse filter to elide the select list from top-level SELECT ... FROM clauses,
@@ -134,22 +127,10 @@ def reformat_sql(sql, *, with_toggle=False):
134127
return f'<span class="djDebugUncollapsed">{skipped}</span>'
135128
return skipped
136129

137-
try:
138-
formatted = parse_sql(sql)
139-
if not with_toggle:
140-
return formatted
141-
simplified = parse_sql(sql, simplify=True)
142-
except Exception as e:
143-
# Handle sqlparse exceptions (e.g., MAX_GROUPING_TOKENS exceeded in >= 0.5.5)
144-
if SQLParseError is not None and isinstance(e, SQLParseError):
145-
reason = f"sqlparse error: {e}"
146-
else:
147-
# Re-raise unexpected exceptions
148-
raise
149-
skipped = _format_skipped_sql(sql, reason)
150-
if with_toggle:
151-
return f'<span class="djDebugUncollapsed">{skipped}</span>'
152-
return skipped
130+
formatted = parse_sql(sql)
131+
if not with_toggle:
132+
return formatted
133+
simplified = parse_sql(sql, simplify=True)
153134

154135
uncollapsed = f'<span class="djDebugUncollapsed">{simplified}</span>'
155136
collapsed = f'<span class="djDebugCollapsed djdt-hidden">{formatted}</span>'

0 commit comments

Comments
 (0)