Ticket #14729: rev14757_raw_query_repr.diff

django/db/models/sql/query.py

@@ -80 +80 @@
         return iter(result)
 
     def __repr__(self):
-        return "<RawQuery: %r>" % (self.sql % self.params)
+        return "<RawQuery: %r>" % (self.sql % tuple(self.params))
 
     def _execute_query(self):
         self.cursor = connections[self.using].cursor()

django/db/models/query.py

@@ -1363 +1363 @@
             yield instance
 
     def __repr__(self):
-        return "<RawQuerySet: %r>" % (self.raw_query % self.params)
+        return "<RawQuerySet: %r>" % (self.raw_query % tuple(self.params))
 
     def __getitem__(self, k):
         return list(self)[k]

tests/regressiontests/queries/tests.py

@@ -1305 +1305 @@
         self.assertIsNot(q1, q1.all())
 
 
+class RawQueriesTests(TestCase):
+    def setUp(self):
+        n1 = Note.objects.create(note='n1', misc='foo', id=1)
+
+    def test_ticket14729(self): 
+        # Test representation of raw query with one or few parameters passed as list
+        query = "SELECT * FROM queries_note WHERE note = %s" 
+        params = ['n1'] 
+        qs = Note.objects.raw(query, params=params) 
+        self.assertEqual(repr(qs), "<RawQuerySet: 'SELECT * FROM queries_note WHERE note = n1'>") 
+
+        query = "SELECT * FROM queries_note WHERE note = %s and misc = %s" 
+        params = ['n1', 'foo'] 
+        qs = Note.objects.raw(query, params=params) 
+        self.assertEqual(repr(qs), "<RawQuerySet: 'SELECT * FROM queries_note WHERE note = n1 and misc = foo'>")
+
+
 class GeneratorExpressionTests(TestCase):
     def test_ticket10432(self):
         # Using an empty generator expression as the rvalue for an "__in"