diff options
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 82ff6bf4ea..bb230647eb 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -30,9 +30,7 @@ from django.db.models.lookups import Lookup from django.db.models.query_utils import ( Q, check_rel_lookup_compatibility, refs_expression, ) -from django.db.models.sql.constants import ( - INNER, LOUTER, ORDER_DIR, ORDER_PATTERN, SINGLE, -) +from django.db.models.sql.constants import INNER, LOUTER, ORDER_DIR, SINGLE from django.db.models.sql.datastructures import ( BaseTable, Empty, Join, MultiJoin, ) @@ -1895,7 +1893,7 @@ class Query(BaseExpression): """ errors = [] for item in ordering: - if isinstance(item, str) and ORDER_PATTERN.match(item): + if isinstance(item, str): if '.' in item: warnings.warn( 'Passing column raw column aliases to order_by() is ' @@ -1904,6 +1902,18 @@ class Query(BaseExpression): category=RemovedInDjango40Warning, stacklevel=3, ) + continue + if item == '?': + continue + if item.startswith('-'): + item = item[1:] + if item in self.annotations: + continue + if self.extra and item in self.extra: + continue + # names_to_path() validates the lookup. A descriptive + # FieldError will be raise if it's not. + self.names_to_path(item.split(LOOKUP_SEP), self.model._meta) elif not hasattr(item, 'resolve_expression'): errors.append(item) if getattr(item, 'contains_aggregate', False): |