mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-21 01:09:13 +00:00
Code Issues 32 Releases Wiki Activity

Refs #36490 -- Simplified QuerySet._batched_insert returning fields handling.

Browse Source 
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.
This commit is contained in:
Simon Charette 2025-07-02 11:50:56 -04:00 committed by Sarah Boyce
parent e1671278e8
commit 5eca562ac3
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django/db/models/query.py
View File

@ -1923,7 +1923,14 @@ class QuerySet(AltersData):
max_batch_size = max(ops.bulk_batch_size(fields, objs), 1) 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 batch_size = min(batch_size, max_batch_size) if batch_size else max_batch_size
inserted_rows = [] 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)] batches = [objs[i : i + batch_size] for i in range(0, len(objs), batch_size)]
if len(batches) > 1: if len(batches) > 1:
context = transaction.atomic(using=self.db, savepoint=False) context = transaction.atomic(using=self.db, savepoint=False)
@ -1931,9 +1938,6 @@ class QuerySet(AltersData):
context = nullcontext() context = nullcontext()
with context: with context:
for item in batches: for item in batches:
if bulk_return and (
on_conflict is None or on_conflict == OnConflict.UPDATE
):
inserted_rows.extend( inserted_rows.extend(
self._insert( self._insert(
item, item,
@ -1942,18 +1946,9 @@ class QuerySet(AltersData):
on_conflict=on_conflict, on_conflict=on_conflict,
update_fields=update_fields, update_fields=update_fields,
unique_fields=unique_fields, unique_fields=unique_fields,
returning_fields=self.model._meta.db_returning_fields, returning_fields=returning_fields,
) )
) )
else:
self._insert(
item,
fields=fields,
using=self.db,
on_conflict=on_conflict,
update_fields=update_fields,
unique_fields=unique_fields,
)
return inserted_rows return inserted_rows
def _chain(self): def _chain(self):