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

Fixed #18333 - Quoted annotated column names

This commit is contained in:
Michael Manfre 2013-09-23 20:52:58 -04:00 committed by Tim Graham
parent 77f6b468e5
commit 9a041807fc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/sql/aggregates.py
View File

@ -79,7 +79,7 @@ class Aggregate(object):
elif isinstance(self.col, (list, tuple)): elif isinstance(self.col, (list, tuple)):
field_name = '.'.join(qn(c) for c in self.col) field_name = '.'.join(qn(c) for c in self.col)
else: else:
field_name = self.col field_name = qn(self.col)
substitutions = { substitutions = {
'function': self.sql_function, 'function': self.sql_function,

10
tests/aggregation_regress/tests.py
View File

@ -1114,3 +1114,13 @@ class AggregationTests(TestCase):
self.assertQuerysetEqual( self.assertQuerysetEqual(
qs, ['Sams Teach Yourself Django in 24 Hours'], qs, ['Sams Teach Yourself Django in 24 Hours'],
lambda b: b.name) lambda b: b.name)
def test_annotate_reserved_word(self):
"""
Regression #18333 - Ensure annotated column name is properly quoted.
"""
vals = Book.objects.annotate(select=Count('authors__id')).aggregate(Sum('select'), Avg('select'))
self.assertEqual(vals, {
'select__sum': 10,
'select__avg': Approximate(1.666, places=2),
})