Ticket #25081: 25081.patch

django/db/models/query.py

@@ -376 +376 @@
         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:

tests/distinct_on_fields/tests.py

@@ -129 +129 @@
             qs, [self.p1_o2, self.p2_o1, self.p3_o1],
             lambda x: x
         )
+
+    def test_distinct_on_with_get(self):
+        """get() respects order_by when distinct on is used."""
+        s = Staff.objects.distinct('name').order_by('name', '-organisation').get(name='p1')
+        self.assertEqual(s.organisation, 'o2')