mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-03 16:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #24923 -- errored out nicely when using aggregates in order_by()

Browse source
This commit is contained in:
Anssi Kääriäinen 2015-06-04 17:50:14 +03:00 • committed by Tim Graham
parent 83f6373030
commit 6f403056f0
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/db/models/sql/query.py
View file

@ -1643,6 +1643,11 @@ class Query(object):
for item in ordering:
if not hasattr(item, 'resolve_expression') and not ORDER_PATTERN.match(item):
errors.append(item)
if getattr(item, 'contains_aggregate', False):
raise FieldError(
'Using an aggregate in order_by() without also including '
'it in annotate() is not allowed: %s' % item
)
if errors:
raise FieldError('Invalid order_by arguments: %s' % errors)
if ordering: