1 files changed, 56 insertions, 1 deletions
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index e1e9bdf..a3eff49 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -12,7 +12,7 @@ from django.views.debug import linebreak_iter
 from django.template import Node
 from django.template.loader import render_to_string
 from django.utils import simplejson
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, DjangoUnicodeDecodeError
 from django.utils.hashcompat import sha_constructor
 from django.utils.translation import ugettext_lazy as _
 
@@ -85,12 +85,67 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
     Replacement for CursorDebugWrapper which stores additional information
     in `connection.queries`.
     """
+    def clean_params(self, params):
+        clean_params = ()
+        for x in params:
+            try:
+                force_unicode(x, strings_only=True)
+            except DjangoUnicodeDecodeError:
+                clean_params += ("<non unicode object>", )
+            else:
+                clean_params += (x, )
+        return clean_params
+
     def execute(self, sql, params=()):
         start = datetime.now()
         try:
             return self.cursor.execute(sql, params)
         finally:
             stop = datetime.now()
+            params = self.clean_params(params)
+            duration = ms_from_timedelta(stop - start)
+            stacktrace = tidy_stacktrace(traceback.extract_stack())
+            _params = ''
+            try:
+                _params = simplejson.dumps([force_unicode(x, strings_only=True) for x in params])
+            except TypeError:
+                pass # object not JSON serializable
+
+            template_info = None
+            cur_frame = sys._getframe().f_back
+            try:
+                while cur_frame is not None:
+                    if cur_frame.f_code.co_name == 'render':
+                        node = cur_frame.f_locals['self']
+                        if isinstance(node, Node):
+                            template_info = get_template_info(node.source)
+                            break
+                    cur_frame = cur_frame.f_back
+            except:
+                pass
+            del cur_frame
+
+            # We keep `sql` to maintain backwards compatibility
+            self.db.queries.append({
+                'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
+                'duration': duration,
+                'raw_sql': sql,
+                'params': _params,
+                'hash': sha_constructor(settings.SECRET_KEY + sql + _params).hexdigest(),
+                'stacktrace': stacktrace,
+                'start_time': start,
+                'stop_time': stop,
+                'is_slow': (duration > SQL_WARNING_THRESHOLD),
+                'is_select': sql.lower().strip().startswith('select'),
+                'template_info': template_info,
+            })
+
+    def executemany(self, sql, params=()):
+        start = datetime.now()
+        try:
+            return self.cursor.executemany(sql, params)
+        finally:
+            stop = datetime.now()
             duration = ms_from_timedelta(stop - start)
             stacktrace = tidy_stacktrace(traceback.extract_stack())
             _params = ''