From db7d7901eeacf37f0a6f124e3733c4f121a23e76 Mon Sep 17 00:00:00 2001 From: ruchit2801 Date: Fri, 17 May 2019 13:00:57 +0530 Subject: [2.2.x] Fixed #30463 -- Fixed crash of deprecation message when Meta.ordering contains expressions. Regression in 1b1f64ee5a78cc217fead52cbae23114502cf564. Backport of 04042b2b440f0bf50eb908d52cfe76af430e1738 from master --- django/db/models/sql/compiler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index bfdf26d4db..f0daffe5c5 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -561,9 +561,9 @@ class SQLCompiler: # order_by = None warnings.warn( "%s QuerySet won't use Meta.ordering in Django 3.1. " - "Add .order_by('%s') to retain the current query." % ( + "Add .order_by(%s) to retain the current query." % ( self.query.model.__name__, - "', '".join(self._meta_ordering) + ', '.join(repr(f) for f in self._meta_ordering), ), RemovedInDjango31Warning, stacklevel=4, -- cgit v1.3