p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25081 -- Prevented DISTINCT ON ordering from being cleared in get(). 

Thanks to pdewacht for the patch.
This commit is contained in:
Simon Charette 2015-07-09 13:52:32 -04:00
parent 7b6d3104f2
commit 07577a2d05
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/query.py
View File

@ -376,7 +376,7 @@ class QuerySet(object):
keyword arguments. keyword arguments.
""" """
clone = self.filter(*args, **kwargs) clone = self.filter(*args, **kwargs)
if self.query.can_filter(): if self.query.can_filter() and not self.query.distinct_fields:
clone = clone.order_by() clone = clone.order_by()
num = len(clone) num = len(clone)
if num == 1: if num == 1:

8
tests/distinct_on_fields/tests.py
View File

@ -129,3 +129,11 @@ class DistinctOnTests(TestCase):
qs, [self.p1_o2, self.p2_o1, self.p3_o1], qs, [self.p1_o2, self.p2_o1, self.p3_o1],
lambda x: x lambda x: x
) )
def test_distinct_on_get_ordering_preserved(self):
"""
Ordering shouldn't be cleared when distinct on fields are specified.
refs #25081
"""
staff = Staff.objects.distinct('name').order_by('name', '-organisation').get(name='p1')
self.assertEqual(staff.organisation, 'o2')