mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-07 20:49:11 +00:00
Code Issues 32 Releases Wiki Activity

[2.1.x] Refs #29451 -- Fixed invalid SQL on MySQL in queries tests.

Browse Source 
Backport of c4f099de1d0d82c5e1f88768300896eae69bddbd from master
This commit is contained in:
Carlton Gibson 2018-06-05 11:13:29 +01:00 committed by Tim Graham
parent 16e691d568
commit dae75481fa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/queries/tests.py
View File

@ -1636,7 +1636,8 @@ class Queries5Tests(TestCase):
['<Ranking: 1: a3>', '<Ranking: 2: a2>', '<Ranking: 3: a1>'] ['<Ranking: 1: a3>', '<Ranking: 2: a2>', '<Ranking: 3: a1>']
) )
qs = Ranking.objects.extra(select={'good': 'case when rank > 2 then 1 else 0 end'}) sql = 'case when %s > 2 then 1 else 0 end' % connection.ops.quote_name('rank')
qs = Ranking.objects.extra(select={'good': sql})
self.assertEqual( self.assertEqual(
[o.good for o in qs.extra(order_by=('-good',))], [o.good for o in qs.extra(order_by=('-good',))],
[True, False, False] [True, False, False]
@ -1657,7 +1658,8 @@ class Queries5Tests(TestCase):
def test_ticket7256(self): def test_ticket7256(self):
# An empty values() call includes all aliases, including those from an # An empty values() call includes all aliases, including those from an
# extra() # extra()
qs = Ranking.objects.extra(select={'good': 'case when rank > 2 then 1 else 0 end'}) sql = 'case when %s > 2 then 1 else 0 end' % connection.ops.quote_name('rank')
qs = Ranking.objects.extra(select={'good': sql})
dicts = qs.values().order_by('id') dicts = qs.values().order_by('id')
for d in dicts: for d in dicts:
del d['id'] del d['id']