diff options
author | Josh Smeaton <josh.smeaton@gmail.com> | 2015-03-05 17:10:48 +1100 |
---|---|---|
committer | Josh Smeaton <josh.smeaton@gmail.com> | 2015-03-06 13:30:02 +1100 |
commit | ceaf31adfff3801f1092a215f73704e15a70e90c (patch) | |
tree | 572e288a9b778956aed01f6fb570285b16937597 /tests/expressions_case | |
parent | 82f7bee1d56e1bf8ae041c6cdeb7374ea6b844de (diff) | |
download | django-ceaf31adfff3801f1092a215f73704e15a70e90c.tar.gz |
Fixed #24420 -- Allowed ordering by case expressions
Diffstat (limited to 'tests/expressions_case')
-rw-r--r-- | tests/expressions_case/tests.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/expressions_case/tests.py b/tests/expressions_case/tests.py index 69f47b1d95..42fa8e61a4 100644 --- a/tests/expressions_case/tests.py +++ b/tests/expressions_case/tests.py @@ -980,6 +980,30 @@ class CaseExpressionTests(TestCase): transform=attrgetter('integer', 'integer2', 'test') ) + def test_order_by_conditional_implicit(self): + self.assertQuerysetEqual( + CaseTestModel.objects.filter(integer__lte=2).annotate(test=Case( + When(integer=1, then=2), + When(integer=2, then=1), + default=3, + output_field=models.IntegerField(), + )).order_by('test', 'pk'), + [(2, 1), (2, 1), (1, 2)], + transform=attrgetter('integer', 'test') + ) + + def test_order_by_conditional_explicit(self): + self.assertQuerysetEqual( + CaseTestModel.objects.filter(integer__lte=2).annotate(test=Case( + When(integer=1, then=2), + When(integer=2, then=1), + default=3, + output_field=models.IntegerField(), + )).order_by(F('test').asc(), 'pk'), + [(2, 1), (2, 1), (1, 2)], + transform=attrgetter('integer', 'test') + ) + class CaseDocumentationExamples(TestCase): @classmethod |