Ticket #245: no-legacy-ordering.diff

django/db/models/query.py

@@ -35 +35 @@
-# HELPER FUNCTIONS #
-####################
-
-# Django currently supports two forms of ordering.
-# Form 1 (deprecated) example:
-#     order_by=(('pub_date', 'DESC'), ('headline', 'ASC'), (None, 'RANDOM'))
-# Form 2 (new-style) example:
-#     order_by=('-pub_date', 'headline', '?')
-# Form 1 is deprecated and will no longer be supported for Django's first
-# official release. The following code converts from Form 1 to Form 2.
-
-LEGACY_ORDERING_MAPPING = {'ASC': '_', 'DESC': '-_', 'RANDOM': '?'}
-
-def handle_legacy_orderlist(order_list):
-    if not order_list or isinstance(order_list[0], basestring):
-        return order_list
-    else:
-        import warnings
-        new_order_list = [LEGACY_ORDERING_MAPPING[j.upper()].replace('_', str(i)) for i, j in order_list]
-        warnings.warn("%r ordering syntax is deprecated. Use %r instead." % (order_list, new_order_list), DeprecationWarning)
-        return new_order_list
-
-def orderfield2column(f, opts):
-    try:
-        return opts.get_field(f, False).column
@@ -64 +45 @@
-    if prefix.endswith('.'):
-        prefix = backend.quote_name(prefix[:-1]) + '.'
-    output = []
-handle_legacy_orderlist(order_list)
+order_list
-        if f.startswith('-'):
-            output.append('%s%s DESC' % (prefix, backend.quote_name(orderfield2column(f[1:], opts))))
-        elif f == '?':
@@ -526 +507 @@
-            ordering_to_use = self._order_by
-        else:
-            ordering_to_use = opts.ordering
-handle_legacy_orderlist(ordering_to_use)
+ordering_to_use
-            if f == '?': # Special case.
-                order_by.append(backend.get_random_function_sql())
-            else: