diff options
author | varunnaganathan <varunnaganathan912@gmail.com> | 2015-12-24 21:12:49 +0530 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-01-02 07:06:54 -0500 |
commit | 3eba9638ee69138c73efb1d1c1d1b806ddafc6cf (patch) | |
tree | dd79667757cbb670e24d1fa8aa25f3e9bbf49648 /tests/expressions_case | |
parent | f0ad641628a3ddc4e1c208e481b9cd0e9304dc3d (diff) | |
download | django-3eba9638ee69138c73efb1d1c1d1b806ddafc6cf.tar.gz |
Fixed #25316 -- Fixed a crash with order_by() and values() after annotate().
Diffstat (limited to 'tests/expressions_case')
-rw-r--r-- | tests/expressions_case/tests.py | 12 |
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( |