mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-18 06:12:23 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29367 -- Fixed model state on objects with a primary key created with QuerySet.bulk_create().

Browse Source
This commit is contained in:
Oscar Esgalha 2018-04-27 14:32:10 -03:00 committed by Tim Graham
parent 3246ad1065
commit 6d1f576945
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,6 +457,9 @@ class QuerySet:
objs_with_pk, objs_without_pk = partition(lambda o: o.pk is None, objs) objs_with_pk, objs_without_pk = partition(lambda o: o.pk is None, objs)
if objs_with_pk: if objs_with_pk:
self._batched_insert(objs_with_pk, fields, batch_size) self._batched_insert(objs_with_pk, fields, batch_size)
for obj_with_pk in objs_with_pk:
obj_with_pk._state.adding = False
obj_with_pk._state.db = self.db
if objs_without_pk: if objs_without_pk:
fields = [f for f in fields if not isinstance(f, AutoField)] fields = [f for f in fields if not isinstance(f, AutoField)]
ids = self._batched_insert(objs_without_pk, fields, batch_size) ids = self._batched_insert(objs_without_pk, fields, batch_size)

9
tests/bulk_create/tests.py
View File

@ -252,3 +252,12 @@ class BulkCreateTests(TestCase):
# Objects save via bulk_create() and save() should have equal state. # Objects save via bulk_create() and save() should have equal state.
self.assertEqual(country_nl._state.adding, country_be._state.adding) self.assertEqual(country_nl._state.adding, country_be._state.adding)
self.assertEqual(country_nl._state.db, country_be._state.db) self.assertEqual(country_nl._state.db, country_be._state.db)
def test_set_state_with_pk_specified(self):
state_ca = State(two_letter_code='CA')
state_ny = State(two_letter_code='NY')
State.objects.bulk_create([state_ca])
state_ny.save()
# Objects save via bulk_create() and save() should have equal state.
self.assertEqual(state_ca._state.adding, state_ny._state.adding)
self.assertEqual(state_ca._state.db, state_ny._state.db)