mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #27554 -- Fixed prefetch_related() crash when fetching relations in nested Prefetches.

Browse source
This commit is contained in:
François Freitag 2017-03-03 18:45:31 -08:00 • committed by Tim Graham
parent 16121da78d
commit c0a2b9508a
3 changed files with 46 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1423,10 +1423,15 @@ def prefetch_related_objects(model_instances, *related_lookups):
# that we can continue with nullable or reverse relations.
new_obj_list = []
for obj in obj_list:
try:
new_obj = getattr(obj, through_attr)
except exceptions.ObjectDoesNotExist:
continue
if through_attr in getattr(obj, '_prefetched_objects_cache', ()):
# If related objects have been prefetched, use the
# cache rather than the object's through_attr.
new_obj = list(obj._prefetched_objects_cache.get(through_attr))
else:
try:
new_obj = getattr(obj, through_attr)
except exceptions.ObjectDoesNotExist:
continue
if new_obj is None:
continue
# We special-case `list` rather than something more generic