innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed failing aggregation tests on MySQL

This commit is contained in:
Anssi Kääriäinen 2013-03-13 12:44:24 +02:00
parent 747f7d2549
commit bd0cba58aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/aggregation_regress/tests.py
View File

@ -901,7 +901,7 @@ class AggregationTests(TestCase):
# There should only be one GROUP BY clause, for the `id` column. # There should only be one GROUP BY clause, for the `id` column.
# `name` and `age` should not be grouped on. # `name` and `age` should not be grouped on.
grouping, gb_params = results.query.get_compiler(using='default').get_grouping([]) grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
self.assertEqual(len(grouping), 1) self.assertEqual(len(grouping), 1)
assert 'id' in grouping[0] assert 'id' in grouping[0]
assert 'name' not in grouping[0] assert 'name' not in grouping[0]
@ -930,7 +930,7 @@ class AggregationTests(TestCase):
def test_aggregate_duplicate_columns_only(self): def test_aggregate_duplicate_columns_only(self):
# Works with only() too. # Works with only() too.
results = Author.objects.only('id', 'name').annotate(num_contacts=Count('book_contact_set')) results = Author.objects.only('id', 'name').annotate(num_contacts=Count('book_contact_set'))
grouping, gb_params = results.query.get_compiler(using='default').get_grouping([]) grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
self.assertEqual(len(grouping), 1) self.assertEqual(len(grouping), 1)
assert 'id' in grouping[0] assert 'id' in grouping[0]
assert 'name' not in grouping[0] assert 'name' not in grouping[0]
@ -960,7 +960,7 @@ class AggregationTests(TestCase):
# And select_related() # And select_related()
results = Book.objects.select_related('contact').annotate( results = Book.objects.select_related('contact').annotate(
num_authors=Count('authors')) num_authors=Count('authors'))
grouping, gb_params = results.query.get_compiler(using='default').get_grouping([]) grouping, gb_params = results.query.get_compiler(using='default').get_grouping([], [])
self.assertEqual(len(grouping), 1) self.assertEqual(len(grouping), 1)
assert 'id' in grouping[0] assert 'id' in grouping[0]
assert 'name' not in grouping[0] assert 'name' not in grouping[0]