Ticket #6901: extra-orderby.diff

django/db/models/base.py

@@ -304 +304 @@
         manager = cls._default_manager
         if pk_set:
             # Determine whether a record with the primary key already exists.
-            if manager.filter(pk=pk_val).extra(select={'a': 1}).values('a').order_by():
+            if manager.filter(pk=pk_val).extra(select={'a': 1}, order_by=('a',)):
                 # It does already exist, so do an UPDATE.
                 if non_pks:
                     values = [(f.name, f.get_db_prep_save(raw and getattr(self, f.attname) or f.pre_save(self, False))) for f in non_pks]
@@ -427 +427 @@
                 (qn('_order'), op, qn('_order'),
                 qn(self._meta.db_table), qn(self._meta.pk.column))]
             params = [self.pk]
-            obj = self._default_manager.filter(**{order_field.name: getattr(self, order_field.attname)}).extra(where=where, params=params).order_by(order)[:1].get()
+            obj = self._default_manager.filter(**{order_field.name: getattr(self, order_field.attname)}).extra(where=where, params=params, order_by=(order,))[:1].get()
             setattr(self, cachename, obj)
         return getattr(self, cachename)