[1.9.x] Fixed #25316 -- Fixed a crash with order_by() and values() after annotate().

Backport of 3eba9638ee69138c73efb1d1c1d1b806ddafc6cf from master

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/expressions_case/tests.py b/tests/expressions_case/tests.py
index c0c299126e..d386cabbc9 100644
--- a/tests/expressions_case/tests.py
+++ b/tests/expressions_case/tests.py
@@ -252,6 +252,18 @@ class CaseExpressionTests(TestCase):
             transform=attrgetter('integer', 'test')
         )
 
+    def test_annotate_values_not_in_order_by(self):
+        self.assertEqual(
+            list(CaseTestModel.objects.annotate(test=Case(
+                When(integer=1, then=Value('one')),
+                When(integer=2, then=Value('two')),
+                When(integer=3, then=Value('three')),
+                default=Value('other'),
+                output_field=models.CharField(),
+            )).order_by('test').values_list('integer', flat=True)),
+            [1, 4, 3, 3, 3, 2, 2]
+        )
+
     def test_combined_expression(self):
         self.assertQuerysetEqual(
             CaseTestModel.objects.annotate(