diff options
| author | Carlton Gibson <carlton.gibson@noumenal.es> | 2018-06-05 11:13:29 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-06-20 11:00:19 -0400 |
| commit | 243f07bbb3e65c44500451a78251d062301fe25d (patch) | |
| tree | b42c5c62f095767a0017ac2f7929cf257e019e1a /tests | |
| parent | 83986af95dc432e54ba71f0c5c13f5e5c02c92e5 (diff) | |
[2.0.x] Refs #29451 -- Fixed invalid SQL on MySQL in queries tests.
Backport of c4f099de1d0d82c5e1f88768300896eae69bddbd from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/queries/tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 79bd8203ca..ba62f52a60 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1609,7 +1609,8 @@ class Queries5Tests(TestCase): ['<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( [o.good for o in qs.extra(order_by=('-good',))], [True, False, False] @@ -1630,7 +1631,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'] |