From 07577a2d05fc33ebef062f97a754dd53079356db Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Thu, 9 Jul 2015 13:52:32 -0400
Subject: Fixed #25081 -- Prevented DISTINCT ON ordering from being cleared in
 get().

Thanks to pdewacht for the patch.
---
 django/db/models/query.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django')

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 1484d9dca9..96ecdbc1f4 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -376,7 +376,7 @@ class QuerySet(object):
         keyword arguments.
         """
         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()
         num = len(clone)
         if num == 1:
-- 
cgit v1.3