From e1f13f15512ece2d8ea8c7bf9f704ce4286c2ffa Mon Sep 17 00:00:00 2001 From: Flávio Juvenal Date: Thu, 12 Apr 2018 15:06:43 -0300 Subject: Fixed #29320 -- Added an exception when an annotation alias matches a ForeignKey attname. --- django/db/models/query.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/models/query.py b/django/db/models/query.py index 71ebf660c7..2db6690c44 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -7,6 +7,7 @@ import operator import warnings from collections import OrderedDict, namedtuple from functools import lru_cache +from itertools import chain from django.conf import settings from django.core import exceptions @@ -981,7 +982,10 @@ class QuerySet: clone = self._chain() names = self._fields if names is None: - names = {f.name for f in self.model._meta.get_fields()} + names = set(chain.from_iterable( + (field.name, field.attname) if hasattr(field, 'attname') else (field.name,) + for field in self.model._meta.get_fields() + )) for alias, annotation in annotations.items(): if alias in names: -- cgit v1.3