mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-09 13:28:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[1.8.x] Fixed #24420 -- Allowed ordering by case expressions

Browse source 
Backport of ceaf31adff from master
This commit is contained in:
Josh Smeaton 2015-03-05 17:10:48 +11:00
parent bd7c879d5a
commit 823f8cdbc9
3 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/expressions_case/tests.py
View file

@ -995,6 +995,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