Permalink
Browse files

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
  • Loading branch information...
1 parent b45a4ac commit 807b2a8216cbb8bfc82a2dc3d57fe2169f3349e4 @alex alex committed Sep 10, 2011
Showing with 3 additions and 2 deletions.
  1. +3 −2 django/db/models/sql/compiler.py
@@ -814,7 +814,8 @@ def as_sql(self):
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 @@ def as_sql(self):
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:

0 comments on commit 807b2a8

Please sign in to comment.