From dae75481fabbe775160893a2e7cb2b2d73705a8f Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 5 Jun 2018 11:13:29 +0100 Subject: [2.1.x] Refs #29451 -- Fixed invalid SQL on MySQL in queries tests. Backport of c4f099de1d0d82c5e1f88768300896eae69bddbd from master --- tests/queries/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index ea55cfc76e..c592086fd4 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1636,7 +1636,8 @@ class Queries5Tests(TestCase): ['', '', ''] ) - 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( [o.good for o in qs.extra(order_by=('-good',))], [True, False, False] @@ -1657,7 +1658,8 @@ class Queries5Tests(TestCase): def test_ticket7256(self): # An empty values() call includes all aliases, including those from an # 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') for d in dicts: del d['id'] -- cgit v1.3