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.
---
 tests/distinct_on_fields/tests.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py
index 68290d7b8f..9e53ce3ae9 100644
--- a/tests/distinct_on_fields/tests.py
+++ b/tests/distinct_on_fields/tests.py
@@ -129,3 +129,11 @@ class DistinctOnTests(TestCase):
             qs, [self.p1_o2, self.p2_o1, self.p3_o1],
             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')
-- 
cgit v1.3