Ticket #7957: django_extra.diff

db/models/sql/query.py

@@ -1529 +1529 @@
         if select:
             # The extra select might be ordered (because it will be accepting
             # parameters).
-            if (isinstance(select, SortedDict) and
-                    not isinstance(self.extra_select, SortedDict)):
+            if not isinstance(self.extra_select, SortedDict):
                 self.extra_select = SortedDict(self.extra_select)
-            self.extra_select.update(select)
+            self.extra_select.append(SortedDict(select))
         if select_params:
             self.extra_select_params += tuple(select_params)
         if where:

utils/datastructures.py

@@ -121 +121 @@
     def update(self, dict_):
         for k, v in dict_.items():
             self.__setitem__(k, v)
+    
+    def append(self, data):
+        for key, value in data.iteritems():
+            super(SortedDict, self).__setitem__(key, value)
+            self.keyOrder.append(key)
 
     def setdefault(self, key, default):
         if key not in self.keyOrder: