diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-24 00:44:48 +0200 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-24 01:20:22 +0200 |
| commit | 421e599ad34b93e9537bf4deeca343f5b2e69f06 (patch) | |
| tree | c9e817f3ed17e396864b652e41676d85fe86a92f | |
| parent | 625dc3f0722d80eaffacc39171ea7337ab089ae4 (diff) | |
[1.5.x] Fixed #19351 -- SQLite bulk_insert of more than 500 single-field objs
Backpatch of 0a0a0d66b316598f7c296e8bf75749a14ce3ac49
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 6 | ||||
| -rw-r--r-- | tests/regressiontests/bulk_create/tests.py | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 7f0c51dd50..6b6c6b67d9 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -120,8 +120,12 @@ class DatabaseOperations(BaseDatabaseOperations): """ SQLite has a compile-time default (SQLITE_LIMIT_VARIABLE_NUMBER) of 999 variables per query. + + If there is just single field to insert, then we can hit another + limit, SQLITE_MAX_COMPOUND_SELECT which defaults to 500. """ - return (999 // len(fields)) if len(fields) > 0 else len(objs) + limit = 999 if len(fields) > 1 else 500 + return (limit // len(fields)) if len(fields) > 0 else len(objs) def date_extract_sql(self, lookup_type, field_name): # sqlite doesn't support extract, so we fake it with the user-defined diff --git a/tests/regressiontests/bulk_create/tests.py b/tests/regressiontests/bulk_create/tests.py index 7cd74d1b47..d4772934a1 100644 --- a/tests/regressiontests/bulk_create/tests.py +++ b/tests/regressiontests/bulk_create/tests.py @@ -103,6 +103,14 @@ class BulkCreateTests(TestCase): self.assertEqual(TwoFields.objects.filter(f2__gte=901).count(), 101) @skipUnlessDBFeature('has_bulk_insert') + def test_large_single_field_batch(self): + # SQLite had a problem with more than 500 UNIONed selects in single + # query. + Restaurant.objects.bulk_create([ + Restaurant() for i in range(0, 501) + ]) + + @skipUnlessDBFeature('has_bulk_insert') def test_large_batch_efficiency(self): with override_settings(DEBUG=True): connection.queries = [] |
