mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-27 04:29:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refs #29444 -- Renamed DatabaseFeatures.can_return_id* to be generic for other columns.

Browse source
This commit is contained in:
Johannes Hoppe 2019-01-30 15:31:56 -05:00 • committed by Tim Graham
parent 16a5a2a2c8
commit b131f9c79f
8 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django/db/models/query.py
View file

@ -431,11 +431,11 @@ class QuerySet:
Insert each of the instances into the database. Do *not* call
save() on each of the instances, do not send any pre/post_save
signals, and do not set the primary key attribute if it is an
autoincrement field (except if features.can_return_ids_from_bulk_insert=True).
autoincrement field (except if features.can_return_rows_from_bulk_insert=True).
Multi-table models are not supported.
"""
# When you bulk insert you don't get the primary keys back (if it's an
# autoincrement, except if can_return_ids_from_bulk_insert=True), so
# autoincrement, except if can_return_rows_from_bulk_insert=True), so
# you can't insert into the child tables which references this. There
# are two workarounds:
# 1) This could be implemented if you didn't have an autoincrement pk
@ -471,7 +471,7 @@ class QuerySet:
if objs_without_pk:
fields = [f for f in fields if not isinstance(f, AutoField)]
ids = self._batched_insert(objs_without_pk, fields, batch_size, ignore_conflicts=ignore_conflicts)
if connection.features.can_return_ids_from_bulk_insert and not ignore_conflicts:
if connection.features.can_return_rows_from_bulk_insert and not ignore_conflicts:
assert len(ids) == len(objs_without_pk)
for obj_without_pk, pk in zip(objs_without_pk, ids):
obj_without_pk.pk = pk
@ -1185,7 +1185,7 @@ class QuerySet:
ops = connections[self.db].ops
batch_size = (batch_size or max(ops.bulk_batch_size(fields, objs), 1))
inserted_ids = []
bulk_return = connections[self.db].features.can_return_ids_from_bulk_insert
bulk_return = connections[self.db].features.can_return_rows_from_bulk_insert
for item in [objs[i:i + batch_size] for i in range(0, len(objs), batch_size)]:
if bulk_return and not ignore_conflicts:
inserted_id = self._insert(