Ticket #1519: extra-select-list.diff

django/db/models/query.py

@@ -72 +72 @@
         self._order_by = None        # Ordering, e.g. ('date', '-name'). If None, use model's ordering.
         self._select_related = False # Whether to fill cache for related objects.
         self._distinct = False       # Whether the query should use SELECT DISTINCT.
-        self._select = {}            # Dictionary of attname -> SQL.
+        self._select = []            # 2-tuple of (attname, SQL).
         self._where = []             # List of extra WHERE clauses to use.
         self._params = []            # List of params to use for extra WHERE clauses.
         self._tables = []            # List of extra tables to use.
@@ -150 +150 @@
         "Performs the SELECT database lookup of this QuerySet."
         # self._select is a dictionary, and dictionaries' key order is
         # undefined, so we convert it to a list of tuples.
-        extra_select = self._select.items()
+        extra_select = self._select