From 98ea4f0f4696221f00e111f1d623452002192e6c Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Sun, 5 Apr 2020 15:32:54 -0400 Subject: Refs #7098 -- Deprecated passing raw column aliases to order_by(). Now that order_by() has expression support passing RawSQL() can achieve the same result. This was also already supported through QuerySet.extra(order_by) for years but this API is more or less deprecated at this point. --- django/db/models/sql/query.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index e5524a8198..82ff6bf4ea 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1895,7 +1895,16 @@ class Query(BaseExpression): """ errors = [] for item in ordering: - if not hasattr(item, 'resolve_expression') and not ORDER_PATTERN.match(item): + if isinstance(item, str) and ORDER_PATTERN.match(item): + if '.' in item: + warnings.warn( + 'Passing column raw column aliases to order_by() is ' + 'deprecated. Wrap %r in a RawSQL expression before ' + 'passing it to order_by().' % item, + category=RemovedInDjango40Warning, + stacklevel=3, + ) + elif not hasattr(item, 'resolve_expression'): errors.append(item) if getattr(item, 'contains_aggregate', False): raise FieldError( -- cgit v1.3