1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Fixed #23001 -- Fixed mixing defer and annotations

This commit is contained in:
Josh Smeaton
2014-07-11 16:55:49 +10:00
committed by Anssi Kääriäinen
parent 954e7b8aad
commit 5b0375ec3e
2 changed files with 26 additions and 1 deletions

View File

@@ -260,7 +260,7 @@ class QuerySet(object):
load_fields.append(field.name)
skip = None
if load_fields and not fill_cache:
if load_fields:
# Some fields have been deferred, so we have to initialize
# via keyword arguments.
skip = set()