Commit 807b2a82 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Fixed bulk_insertion on databases which don't yet support it. Thanks to Justin... 

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
parent b45a4acf

django/db/models/sql/compiler.py

+3 −2
Original line number Diff line number Diff line
@@ -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: