From 59ffafa1d2f466fa7aacbe74fe2787b2004b7871 Mon Sep 17 00:00:00 2001 From: Iain Watts Date: Wed, 15 May 2019 16:09:16 -0700 Subject: Fixed #30482 -- Prevented unnecessary evaluation of lookup.queryset in prefetch_related_objects(). --- django/db/models/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/models/query.py b/django/db/models/query.py index a21a091af0..1544beb613 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1556,7 +1556,7 @@ def prefetch_related_objects(model_instances, *related_lookups): while all_lookups: lookup = all_lookups.pop() if lookup.prefetch_to in done_queries: - if lookup.queryset: + if lookup.queryset is not None: raise ValueError("'%s' lookup was already seen with a different queryset. " "You may need to adjust the ordering of your lookups." % lookup.prefetch_to) -- cgit v1.3