mirror of
https://github.com/django/django.git
synced 2024-12-01 15:42:04 +01:00
Fixed bulk_insertion on databases which don't yet support it. Thanks to Justin Bronn for his Oracle wizardry.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
b45a4acf6f
commit
807b2a8216
@ -814,7 +814,8 @@ class SQLInsertCompiler(SQLCompiler):
|
||||
values = [[self.connection.ops.pk_default_value()] for obj in self.query.objs]
|
||||
params = [[]]
|
||||
fields = [None]
|
||||
can_bulk = not any(hasattr(field, "get_placeholder") for field in fields) and not self.return_id
|
||||
can_bulk = (not any(hasattr(field, "get_placeholder") for field in fields) and
|
||||
not self.return_id and self.connection.features.has_bulk_insert)
|
||||
|
||||
if can_bulk:
|
||||
placeholders = [["%s"] * len(fields)]
|
||||
@ -831,7 +832,7 @@ class SQLInsertCompiler(SQLCompiler):
|
||||
result.append(r_fmt % col)
|
||||
params += r_params
|
||||
return [(" ".join(result), tuple(params))]
|
||||
if can_bulk and self.connection.features.has_bulk_insert:
|
||||
if can_bulk:
|
||||
result.append(self.connection.ops.bulk_insert_sql(fields, len(values)))
|
||||
return [(" ".join(result), tuple([v for val in values for v in val]))]
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user