Ticket #12612: 12612_patch.diff

django/db/backends/sqlite3/base.py

@@ -201 +201 @@
             raise utils.DatabaseError, utils.DatabaseError(*tuple(e)), sys.exc_info()[2]
 
     def executemany(self, query, param_list):
+        query = self.convert_query(query, len(param_list[0]))
         try:
-            query = self.convert_query(query, len(param_list[0]))
             return Database.Cursor.executemany(self, query, param_list)
-        except (IndexError,TypeError):
-            # No parameter list provided
-            return None
         except Database.IntegrityError, e:
             raise utils.IntegrityError, utils.IntegrityError(*tuple(e)), sys.exc_info()[2]
         except Database.DatabaseError, e:

tests/modeltests/cursor/tests.py

@@ +1 @@
+from django.db import connection
+from django.test import TestCase
+
+class CursorTests(TestCase):
+    def setUp(self):
+        cursor = connection.cursor()
+        query = 'create table test (Field1 NUMBER(11),Field2 NUMBER(11))'
+        cursor.execute(query)
+    
+    def testExecuteManyEmptyParams(self):
+        """ Test for bug 12612, removing the error suppression of 4765 """
+        cursor = connection.cursor()
+        query = "insert into test (name) values(%s)"
+        try:
+            cursor.executemany(query, [])
+            self.fail("Should have raised an IndexError here!")
+        except IndexError:
+            pass
+    
+    def testExecuteManyStringFormatting(self):
+        """ Test for bug 4896 re: string formatting with executemany() """
+        cursor = connection.cursor()
+        query = 'insert into test values (%s, %s)'
+        cursor.executemany(query, [(i,i+1) for i in range(1,100)])
+    
+    def tearDown(self):
+        cursor = connection.cursor()
+        query = 'drop table test'
+        cursor.execute(query)