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

Refs #36260 -- Moved _is_pk_set checks into _prepare_for_bulk_create().

Browse Source 
To avoid looping over objs twice.
This commit is contained in:
Simon Charette 2025-03-17 17:31:24 +03:00 committed by Sarah Boyce
parent 77b4ecbd53
commit 7d9aab8da0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ from django.db.models.utils import (
resolve_callables, resolve_callables,
) )
from django.utils import timezone from django.utils import timezone
from django.utils.functional import cached_property, partition from django.utils.functional import cached_property
# The maximum number of results to fetch in a get() query. # The maximum number of results to fetch in a get() query.
MAX_GET_RESULTS = 21 MAX_GET_RESULTS = 21
@ -670,11 +670,20 @@ class QuerySet(AltersData):
acreate.alters_data = True acreate.alters_data = True
def _prepare_for_bulk_create(self, objs): def _prepare_for_bulk_create(self, objs):
objs_with_pk, objs_without_pk = [], []
for obj in objs: for obj in objs:
if not obj._is_pk_set(): if isinstance(obj.pk, DatabaseDefault):
# Populate new PK values. objs_without_pk.append(obj)
elif obj._is_pk_set():
objs_with_pk.append(obj)
else:
obj.pk = obj._meta.pk.get_pk_value_on_save(obj) obj.pk = obj._meta.pk.get_pk_value_on_save(obj)
if obj._is_pk_set():
objs_with_pk.append(obj)
else:
objs_without_pk.append(obj)
obj._prepare_related_fields_for_save(operation_name="bulk_create") obj._prepare_related_fields_for_save(operation_name="bulk_create")
return objs_with_pk, objs_without_pk
def _check_bulk_create_options( def _check_bulk_create_options(
self, ignore_conflicts, update_conflicts, update_fields, unique_fields self, ignore_conflicts, update_conflicts, update_fields, unique_fields
@ -787,12 +796,8 @@ class QuerySet(AltersData):
self._for_write = True self._for_write = True
fields = [f for f in opts.concrete_fields if not f.generated] fields = [f for f in opts.concrete_fields if not f.generated]
objs = list(objs) objs = list(objs)
self._prepare_for_bulk_create(objs) objs_with_pk, objs_without_pk = self._prepare_for_bulk_create(objs)
with transaction.atomic(using=self.db, savepoint=False): with transaction.atomic(using=self.db, savepoint=False):
objs_without_pk, objs_with_pk = partition(
lambda o: o._is_pk_set() and not isinstance(o.pk, DatabaseDefault),
objs,
)
if objs_with_pk: if objs_with_pk:
returned_columns = self._batched_insert( returned_columns = self._batched_insert(
objs_with_pk, objs_with_pk,