Fixed #24615 -- ordering by expression not part of SELECT

Fixed queries where an expression was used in order_by() but the
expression wasn't in the query's select clause (for example the
expression could be masked by .values() call)

Thanks to Trac alias MattBlack85 for the report.

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/gis_tests/distapp/tests.py b/tests/gis_tests/distapp/tests.py
index b9ba7e4df8..1889f2d9f9 100644
--- a/tests/gis_tests/distapp/tests.py
+++ b/tests/gis_tests/distapp/tests.py
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.contrib.gis.geos import HAS_GEOS
+from django.contrib.gis.geos import HAS_GEOS, Point
 from django.contrib.gis.measure import D  # alias for Distance
 from django.db import connection
 from django.db.models import Q
@@ -383,3 +383,10 @@ class DistanceTest(TestCase):
         z = SouthTexasZipcode.objects.distance(htown.point).area().get(name='78212')
         self.assertIsNone(z.distance)
         self.assertIsNone(z.area)
+
+    @skipUnlessDBFeature("has_distance_method")
+    def test_distance_order_by(self):
+        qs = SouthTexasCity.objects.distance(Point(3, 3)).order_by(
+            'distance'
+        ).values_list('name', flat=True).filter(name__in=('San Antonio', 'Pearland'))
+        self.assertQuerysetEqual(qs, ['San Antonio', 'Pearland'], lambda x: x)