test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Alex Gaynor 2011-09-10 22:02:13 +00:00
parent b45a4acf6f
commit 807b2a8216
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/sql/compiler.py
View File

@ -814,7 +814,8 @@ class SQLInsertCompiler(SQLCompiler):
values = [[self.connection.ops.pk_default_value()] for obj in self.query.objs] values = [[self.connection.ops.pk_default_value()] for obj in self.query.objs]
params = [[]] params = [[]]
fields = [None] 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: if can_bulk:
placeholders = [["%s"] * len(fields)] placeholders = [["%s"] * len(fields)]
@ -831,7 +832,7 @@ class SQLInsertCompiler(SQLCompiler):
result.append(r_fmt % col) result.append(r_fmt % col)
params += r_params params += r_params
return [(" ".join(result), tuple(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))) result.append(self.connection.ops.bulk_insert_sql(fields, len(values)))
return [(" ".join(result), tuple([v for val in values for v in val]))] return [(" ".join(result), tuple([v for val in values for v in val]))]
else: else: