mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-03 21:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed an aggregation test failure on MySQL.

Browse source
This commit is contained in:
Simon Charette 2013-08-19 20:39:30 -04:00
parent ac0e41e2c4
commit fdbf492946
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/aggregation/tests.py
View file

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import datetime import datetime
from decimal import Decimal from decimal import Decimal
import re
from django.db import connection from django.db import connection
from django.db.models import Avg, Sum, Count, Max, Min from django.db.models import Avg, Sum, Count, Max, Min
@ -640,5 +641,14 @@ class BaseAggregateTestCase(TestCase):
self.assertEqual(len(captured_queries), 1) self.assertEqual(len(captured_queries), 1)
qstr = captured_queries[0]['sql'].lower() qstr = captured_queries[0]['sql'].lower()
self.assertNotIn('for update', qstr) self.assertNotIn('for update', qstr)
forced_ordering = connection.ops.force_no_ordering()
if forced_ordering:
# If the backend needs to force an ordering we make sure it's
# the only "ORDER BY" clause present in the query.
self.assertEqual(
re.findall(r'order by (\w+)', qstr),
[', '.join(forced_ordering).lower()]
)
else:
self.assertNotIn('order by', qstr) self.assertNotIn('order by', qstr)
self.assertEqual(qstr.count(' join '), 0) self.assertEqual(qstr.count(' join '), 0)