diff options
| -rw-r--r-- | django/db/models/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index baf436791a..f4f61614d2 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1082,7 +1082,7 @@ class ValuesQuerySet(QuerySet): if self._fields: self.extra_names = [] self.aggregate_names = [] - if not self.query.extra and not self.query.aggregates: + if not self.query._extra and not self.query._aggregates: # Short cut - if there are no extra or aggregates, then # the values() clause must be just field names. self.field_names = list(self._fields) @@ -1093,7 +1093,7 @@ class ValuesQuerySet(QuerySet): # we inspect the full extra_select list since we might # be adding back an extra select item that we hadn't # had selected previously. - if f in self.query.extra: + if self.query._extra and f in self.query._extra: self.extra_names.append(f) elif f in self.query.aggregate_select: self.aggregate_names.append(f) |