mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-01 07:48:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #24986 -- Added support for annotations in DISTINCT queries.

Browse source
This commit is contained in:
Valentina Mukhamedzhanova 2015-08-14 20:22:08 +02:00 • committed by Tim Graham
parent 98bcdfa8bd
commit 1f7b25c1a7
5 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
django/db/models/sql/query.py
View file

@ -1292,9 +1292,15 @@ class Query(object):
cur_names_with_path = (name, [])
if name == 'pk':
name = opts.pk.name
field = None
try:
field = opts.get_field(name)
except FieldDoesNotExist:
if name in self.annotation_select:
field = self.annotation_select[name].output_field
if field is not None:
# Fields that contain one-to-many relations with a generic
# model (like a GenericForeignKey) cannot generate reverse
# relations and therefore cannot be used for reverse querying.
@ -1305,8 +1311,11 @@ class Query(object):
"querying. If it is a GenericForeignKey, consider "
"adding a GenericRelation." % name
)
model = field.model._meta.concrete_model
except FieldDoesNotExist:
try:
model = field.model._meta.concrete_model
except AttributeError:
model = None
else:
# We didn't find the current field, so move position back
# one step.
pos -= 1