Ticket #7302: 7302.diff

django/db/models/sql/query.py

@@ -601 +601 @@
                 # on verbatim.
                 col, order = get_order_dir(field, asc)
                 table, col = col.split('.', 1)
-                elt = '%s.%s' % (qn(table), col)
+                elt = '%s.%s' % (qn(table), qn2(col))
                 if not distinct or elt in select_aliases:
                     result.append('%s %s' % (elt, order))
             elif get_order_dir(field)[0] not in self.extra_select: