diff options
| author | Simon Charette <charette.s@gmail.com> | 2025-07-02 11:50:56 -0400 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-08-15 10:45:02 +0200 |
| commit | 5eca562ac3cbfd3b0c6522f3d7ad4be034e1cb8c (patch) | |
| tree | 5d244c0427b4166a2ecc6bec117d9633eccf88f0 | |
| parent | e1671278e88265e64811657b8b939b5d786295cb (diff) | |
Refs #36490 -- Simplified QuerySet._batched_insert returning fields handling.
Whether or not returning_fields should be specified to _insert is not a
function of each batches so the conditional can be moved outside of the loop.
| -rw-r--r-- | django/db/models/query.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 096c7fb864..9f245b02ca 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1923,7 +1923,14 @@ class QuerySet(AltersData): max_batch_size = max(ops.bulk_batch_size(fields, objs), 1) batch_size = min(batch_size, max_batch_size) if batch_size else max_batch_size inserted_rows = [] - bulk_return = connection.features.can_return_rows_from_bulk_insert + returning_fields = ( + self.model._meta.db_returning_fields + if ( + connection.features.can_return_rows_from_bulk_insert + and (on_conflict is None or on_conflict == OnConflict.UPDATE) + ) + else None + ) batches = [objs[i : i + batch_size] for i in range(0, len(objs), batch_size)] if len(batches) > 1: context = transaction.atomic(using=self.db, savepoint=False) @@ -1931,21 +1938,7 @@ class QuerySet(AltersData): context = nullcontext() with context: for item in batches: - if bulk_return and ( - on_conflict is None or on_conflict == OnConflict.UPDATE - ): - inserted_rows.extend( - self._insert( - item, - fields=fields, - using=self.db, - on_conflict=on_conflict, - update_fields=update_fields, - unique_fields=unique_fields, - returning_fields=self.model._meta.db_returning_fields, - ) - ) - else: + inserted_rows.extend( self._insert( item, fields=fields, @@ -1953,7 +1946,9 @@ class QuerySet(AltersData): on_conflict=on_conflict, update_fields=update_fields, unique_fields=unique_fields, + returning_fields=returning_fields, ) + ) return inserted_rows def _chain(self): |