Ticket #7302: 7302.1.diff

django/db/models/sql/query.py

@@ -629 +629 @@
                     result.append('%s %s' % (elt, order))
             else:
                 col, order = get_order_dir(field, asc)
-                elt = qn(col)
+                elt = qn2(col)
                 if distinct and elt not in select_aliases:
                     ordering_aliases.append(elt)
                 result.append('%s %s' % (elt, order))

tests/modeltests/ordering/models.py

@@ -77 +77 @@
 # take the first two).
 >>> Article.objects.all().reverse()[:2]
 [<Article: Article 1>, <Article: Article 3>]
+
+# Ordering with 'extra' properly quotes aliases to not clash with SQL keywords
+>>> Article.objects.extra(select={'order': 'pub_date'}, order_by=['order', 'headline'])
+[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
 """}