Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.2.X] Fixed #13159 -- properly quote aggregates in order_by. Backport of [15318].

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2011-01-26 03:52:41 +00:00
parent 1418c215f4
commit 4cee764a46
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,7 @@ class SQLCompiler(object):
continue continue
col, order = get_order_dir(field, asc) col, order = get_order_dir(field, asc)
if col in self.query.aggregate_select: if col in self.query.aggregate_select:
result.append('%s %s' % (col, order)) result.append('%s %s' % (qn(col), order))
continue continue
if '.' in field: if '.' in field:
# This came in through an extra(order_by=...) addition. Pass it # This came in through an extra(order_by=...) addition. Pass it

12
tests/regressiontests/aggregation_regress/tests.py
View File

@ -768,6 +768,18 @@ class AggregationTests(TestCase):
attrgetter("name") attrgetter("name")
) )
def test_quoting_aggregate_order_by(self):
qs = Book.objects.filter(
name="Python Web Development with Django"
).annotate(
authorCount=Count("authors")
).order_by("authorCount")
self.assertQuerysetEqual(
qs, [
("Python Web Development with Django", 3),
],
lambda b: (b.name, b.authorCount)
)
if run_stddev_tests(): if run_stddev_tests():
def test_stddev(self): def test_stddev(self):