From 4ef51f1c912d49c7650126398c4ac38fef0f795c Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Thu, 11 Sep 2008 23:18:14 -0700
Subject: Moving reformat sql so we can pull this in elsewhere.

---
 debug_toolbar/panels/sql.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index f23e317..8edfce9 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -36,13 +36,6 @@ class SQLDebugPanel(DebugPanel):
         self._offset = len(connection.queries)
         self._sql_time = 0
 
-    def _reformat_sql(self, sql):
-        sql = sql.replace('`,`', '`, `')
-        sql = sql.replace('` FROM `', '` \n  FROM `')
-        sql = sql.replace('` WHERE ', '` \n  WHERE ')
-        sql = sql.replace(' ORDER BY ', ' \n  ORDER BY ')
-        return sql
-
     def title(self):
         self._sql_time = sum(map(lambda q: float(q['time']) * 1000, connection.queries))
         return '%d SQL Queries (%.2fms)' % (len(connection.queries), self._sql_time)
@@ -53,10 +46,19 @@ class SQLDebugPanel(DebugPanel):
     def content(self):
         sql_queries = connection.queries[self._offset:]
         for query in sql_queries:
-            query['sql'] = self._reformat_sql(query['sql'])
+            query['sql'] = reformat_sql(query['sql'])
 
         context = {
             'queries': sql_queries,
             'sql_time': self._sql_time,
         }
         return render_to_string('debug_toolbar/panels/sql.html', context)
+
+def reformat_sql(sql):
+    sql = sql.replace('`,`', '`, `')
+    sql = sql.replace('` FROM `', '` \n  FROM `')
+    sql = sql.replace('` WHERE ', '` \n  WHERE ')
+    sql = sql.replace('` INNER JOIN ', '` \n  INNER JOIN ')
+    sql = sql.replace('` OUTER JOIN ', '` \n  OUTER JOIN ')
+    sql = sql.replace(' ORDER BY ', ' \n  ORDER BY ')
+    return sql
-- 
cgit v1.2.3


From 8377ea179568c1fbf8f46db1234e85d689daae0a Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Thu, 11 Sep 2008 23:19:27 -0700
Subject: Adding JSON params to pass to view and adding link for explain.

---
 debug_toolbar/panels/sql.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 8edfce9..757505a 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -1,3 +1,4 @@
+import simplejson
 import time
 from debug_toolbar.panels import DebugPanel
 from django.db import connection
@@ -20,7 +21,7 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
                 'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
                 'time': stop - start,
                 'raw_sql': sql,
-                'params': params,
+                'params': simplejson.dumps(params),
             })
 util.CursorDebugWrapper = DatabaseStatTracker
 
-- 
cgit v1.2.3


From 43bb25c874f765800076285e76b2b0ba1460a597 Mon Sep 17 00:00:00 2001
From: Nowell Strite
Date: Fri, 19 Sep 2008 01:17:16 -0400
Subject: Fixed template panel to skip over debug_toolbar templates. Fixed a
 bug in template context output where rendering would hang while trying to
 autoescape the context variable output.

---
 debug_toolbar/panels/template.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'debug_toolbar/panels')

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index f02b673..bda6630 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -50,6 +50,9 @@ class TemplateDebugPanel(DebugPanel):
             info = {}
             # Clean up some info about templates
             t = d.get('template', None)
+            # Skip templates that we are generating through the debug toolbar.
+            if t.name.startswith('debug_toolbar/'):
+                continue
             if t.origin and t.origin.name:
                 t.origin_name = t.origin.name
             else:
-- 
cgit v1.2.3