diff options
| author | Josh Smeaton <josh.smeaton@gmail.com> | 2014-07-11 16:55:49 +1000 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2014-08-12 14:58:10 +0300 |
| commit | 5b0375ec3e7473fcc29c21003fef80c0d0be183f (patch) | |
| tree | dc8609cb7647827030adcb12c16a0d3de754f2df /django | |
| parent | 954e7b8aad3f3925e63a0a156b7df7466895e073 (diff) | |
Fixed #23001 -- Fixed mixing defer and annotations
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 013da72862..5d51a7c955 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -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() |