fix django sql hook

2 files changed, 27 insertions, 14 deletions

diff --git a/raven/contrib/django/client.py b/raven/contrib/django/client.py
index a161342..0940208 100644
--- a/raven/contrib/django/client.py
+++ b/raven/contrib/django/client.py
@@ -83,6 +83,23 @@ def format_sql(sql, params):
     return sql, rv
 
 
+def record_sql(vendor, alias, start, duration, sql, params):
+    def processor(data):
+        real_sql, real_params = format_sql(sql, params)
+        if real_params:
+            try:
+                real_sql = real_sql % tuple(real_params)
+            except TypeError:
+                pass
+        # maybe category to 'django.%s.%s' % (vendor, alias or
+        #   'default') ?
+        data.update({
+            'message': real_sql,
+            'category': 'query',
+        })
+    breadcrumbs.record(processor=processor)
+
+
 @once
 def install_sql_hook():
     """If installed this causes Django's queries to be captured."""
@@ -99,19 +116,6 @@ def install_sql_hook():
         # trickery would have to look different but I can't be bothered.
         return
 
-    def record_sql(vendor, alias, start, duration, sql, params):
-        def processor(data):
-            real_sql, real_params = format_sql(sql, params)
-            if real_params:
-                real_sql = real_sql % tuple(real_params)
-            # maybe category to 'django.%s.%s' % (vendor, alias or
-            #   'default') ?
-            data.update({
-                'message': real_sql,
-                'category': 'query',
-            })
-        breadcrumbs.record(processor=processor)
-
     def record_many_sql(vendor, alias, start, sql, param_list):
         duration = time.time() - start
         for params in param_list:
diff --git a/tests/contrib/django/tests.py b/tests/contrib/django/tests.py
index 56f863d..086bb4c 100644
--- a/tests/contrib/django/tests.py
+++ b/tests/contrib/django/tests.py
@@ -29,7 +29,7 @@ except ImportError:
 
 from raven.base import Client
 from raven.utils.compat import StringIO, iteritems, PY2, string_types, text_type
-from raven.contrib.django.client import DjangoClient
+from raven.contrib.django.client import DjangoClient, record_sql
 from raven.contrib.django.celery import CeleryClient
 from raven.contrib.django.handlers import SentryHandler
 from raven.contrib.django.models import (
@@ -919,3 +919,12 @@ class SentryExceptionHandlerTest(TestCase):
             self.client.ignore_exceptions.clear()
 
         assert not mock_send.called
+
+
+class SQLHookTestCase(TestCase):
+    def test_wrong_params(self):
+        query = 'SELECT COUNT(*) FROM mytestmodel WHERE id = %s'
+        args = ['foobar', 42]
+        record_sql(None, None, None, None, query, args)
+        crumbs = get_client().context.breadcrumbs.get_buffer()
+        self.assertEqual(crumbs[-1]['message'], query)