aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/panels/sql.py
diff options
context:
space:
mode:
Diffstat (limited to 'debug_toolbar/panels/sql.py')
-rw-r--r--debug_toolbar/panels/sql.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index fc53247..7396c3a 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -48,9 +48,10 @@ class SQLDebugPanel(DebugPanel):
def title(self):
self._sql_time = sum(map(lambda q: float(q['time']), connection.queries))
+ num_queries = len(connection.queries) - self._offset
return '%d SQL %s (%.2fms)' % (
- len(connection.queries),
- (len(connection.queries) == 1) and 'query' or 'queries',
+ num_queries,
+ (num_queries == 1) and 'query' or 'queries',
self._sql_time
)
@@ -65,6 +66,7 @@ class SQLDebugPanel(DebugPanel):
context = {
'queries': sql_queries,
'sql_time': self._sql_time,
+ 'is_mysql': settings.DATABASE_ENGINE == 'mysql',
}
return render_to_string('debug_toolbar/panels/sql.html', context)
@@ -74,7 +76,7 @@ def reformat_sql(sql):
sql = sql.replace('` FROM ', '`\nFROM\n\t')
sql = sql.replace(' WHERE ', '\nWHERE\n\t')
sql = sql.replace(' INNER JOIN ', '\nINNER JOIN\n\t')
- sql = sql.replace(' OUTER JOIN ', '\nOUTER JOIN\n\t')
+ sql = sql.replace(' LEFT OUTER JOIN ', '\nLEFT OUTER JOIN\n\t')
sql = sql.replace(' ORDER BY ', '\nORDER BY\n\t')
# Use Pygments to highlight SQL if it's available
try: