From 159e690ff3d07c8821332942ae722bdf0bdf5208 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 23 Sep 2008 21:06:39 -0700
Subject: Add catch for non JSON serializable objects and don't show the
 EXPLAIN link for these.

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

(limited to 'debug_toolbar/panels/sql.py')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index e4e3c02..9223cb7 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -16,12 +16,17 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
             return self.cursor.execute(sql, params)
         finally:
             stop = time.time()
+            _params = None
+            try:
+                _params = simplejson.dumps(params)
+            except TypeError:
+                pass # object not JSON serializable
             # We keep `sql` to maintain backwards compatibility
             self.db.queries.append({
                 'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
                 'time': stop - start,
                 'raw_sql': sql,
-                'params': simplejson.dumps(params),
+                'params': _params
             })
 util.CursorDebugWrapper = DatabaseStatTracker
 
-- 
cgit v1.2.3