Ticket #5020: query.py.4.diff

query.py

@@ -89 +89 @@
-        self._filters = Q()
-        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._recurse_fields = None
-        self._max_related_depth = 0  # Maximum "depth" for select_related
-        self._distinct = False       # Whether the query should use SELECT DISTINCT.
-        self._select = {}            # Dictionary of attname -> SQL.
@@ -200 +201 @@
-                    row = self.resolve_columns(row, fields)
-                if fill_cache:
-                    obj, index_end = get_cached_row(klass=self.model, row=row,
-
+, fields=self._recurse_fields
-                else:
-                    obj = self.model(*row[:index_end])
-                for i, k in enumerate(extra_select):
@@ -408 +409 @@
-        else:
-            return self._filter_or_exclude(None, **filter_obj)
-
-true_or_false=True, depth=0
+*fields, **kwargs
-        "Returns a new QuerySet instance with '_select_related' modified."
-
+
+
+
+
-
-    def order_by(self, *field_names):
-        "Returns a new QuerySet instance with the ordering changed."
@@ -444 +448 @@
-        c._filters = self._filters
-        c._order_by = self._order_by
-        c._select_related = self._select_related
+        c._recurse_fields = self._recurse_fields
-        c._max_related_depth = self._max_related_depth
-        c._distinct = self._distinct
-        c._select = self._select.copy()
@@ -501 +506 @@
-            fill_table_cache(opts, select, tables, where,
-                             old_prefix=opts.db_table,
-                             cache_tables_seen=[opts.db_table],
-
+, fields=self._recurse_fields
-
-        # Add any additional SELECTs.
-        if self._select:
@@ -819 +824 @@
-            raise NotImplementedError
-    raise TypeError, "Got invalid lookup_type: %s" % repr(lookup_type)
-
-
+fields=None, 
-    """Helper function that recursively returns an object with cache filled"""
-
-    # If we've got a max_depth set and we've exceeded that depth, bail now.
-    if max_depth and cur_depth > max_depth:
-        return None
-
+    fields_to_join = get_select_related_fields(klass._meta, fields)
+
-    index_end = index_start + len(klass._meta.fields)
-    obj = klass(*row[index_start:index_end])
-
-
-
-
-
-
+
+
+
+
+
-    return obj, index_end
-
-fill_table_cache(opts, select, tables, where, old_prefix, cache_tables_seen, max_depth=0, cur_depth=0
+get_select_related_fields(opts, fields=None
-    """
+    Helper function that returns a dictionary of fields for select_related()
+    """
+    if fields is None:
+        fields_to_join = dict([(f, None) for f in opts.fields if f.rel and not f.null])
+    else:
+        fields_for_lookup = dict([(f.name, f) for f in opts.fields if f.rel])
+        fields_to_join = dict()
+        for f in fields:
+            path = f.split(LOOKUP_SEPARATOR)
+            try:
+                fn = fields_for_lookup[path[0]]
+                if fn not in fields_to_join:
+                    fields_to_join[fn] = []
+                if len(path) > 1:
+                    fields_to_join[fn].append(LOOKUP_SEPARATOR.join(path[1:]))
+            except KeyError:
+                raise FieldDoesNotExist, '%s has no field named %s' % (opts.object_name, path[0])
+    return fields_to_join
+
+def fill_table_cache(opts, select, tables, where, old_prefix, cache_tables_seen, max_depth=0, fields=None, cur_depth=0):
+    """
-    Helper function that recursively populates the select, tables and where (in
-    place) for select_related queries.
+
+    Implicit select_related calls on NULL fields will force an INNER JOIN currently.
-    """
-
-    # If we've got a max_depth set and we've exceeded that depth, bail now.
-
+=
-        return None
-
+    fields_to_join = get_select_related_fields(opts, fields)
+
-    qn = backend.quote_name
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def parse_lookup(kwarg_items, opts):
-    # Helper function that handles converting API kwargs