mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 16:16:12 +00:00
Code Issues 32 Releases Wiki Activity

Refs #28909 -- Simplified code using unpacking generalizations.

Browse Source
This commit is contained in:
Aarni Koskela
2025-03-05 18:45:10 +02:00
committed by nessita
parent 6888375c53
commit c972af69e2
40 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -891,7 +891,7 @@ class QuerySet(AltersData):
self._for_write = True
connection = connections[self.db]
max_batch_size = connection.ops.bulk_batch_size(
[opts.pk, opts.pk] + fields, objs
[opts.pk, opts.pk, *fields], objs
)
batch_size = min(batch_size, max_batch_size) if batch_size else max_batch_size
requires_casting = connection.features.requires_casted_case_in_updates
@@ -1524,9 +1524,7 @@ class QuerySet(AltersData):
# Clear limits and ordering so they can be reapplied
clone.query.clear_ordering(force=True)
clone.query.clear_limits()
clone.query.combined_queries = (self.query,) + tuple(
qs.query for qs in other_qs
)
clone.query.combined_queries = (self.query, *(qs.query for qs in other_qs))
clone.query.combinator = combinator
clone.query.combinator_all = all
return clone