Ticket #7580: binary_patch.diff

db/models/sql/query.py

@@ -557 +557 @@
         else:
             asc, desc = ORDER_DIR['DESC']
         for field in ordering:
+            binary_extra = ''
+            if field.endswith('__binary'):
+                field = field.rstrip('__binary')  
+                binary_extra = 'BINARY '
+ 
             if field == '?':
                 result.append(self.connection.ops.random_function_sql())
                 continue
@@ -566 +571 @@
                     field = -field
                 else:
                     order = asc
-                result.append('%s %s' % (field, order))
+                result.append('%s %s' % (binary_extra + field, order))
                 continue
             if '.' in field:
                 # This came in through an extra(order_by=...) addition. Pass it
@@ -575 +580 @@
                 table, col = col.split('.', 1)
                 elt = '%s.%s' % (qn(table), col)
                 if not distinct or elt in select_aliases:
-                    result.append('%s %s' % (elt, order))
+                    result.append('%s %s' % (binary_extra + elt, order))
             elif get_order_dir(field)[0] not in self.extra_select:
                 # 'col' is of the form 'field' or 'field1__field2' or
                 # '-field1__field2__field', etc.
@@ -584 +589 @@
                     elt = '%s.%s' % (qn(table), qn2(col))
                     if distinct and elt not in select_aliases:
                         ordering_aliases.append(elt)
-                    result.append('%s %s' % (elt, order))
+                    result.append('%s %s' % (binary_extra + elt, order))
             else:
                 col, order = get_order_dir(field, asc)
                 elt = qn(col)
                 if distinct and elt not in select_aliases:
                     ordering_aliases.append(elt)
-                result.append('%s %s' % (elt, order))
+                result.append('%s %s' % (binary_extra + elt, order))
         self.ordering_aliases = ordering_aliases
         return result