Ticket #3275: query.py.diff

query.py

@@ -80 +80 @@
-        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_depth = 0      # Used to track how deep we are following for select_related()
+        self._recurse_fields = []    # Fields to recurse through for select_related()
-        self._distinct = False       # Whether the query should use SELECT DISTINCT.
-        self._select = {}            # Dictionary of attname -> SQL.
-        self._where = []             # List of extra WHERE clauses to use.
@@ -178 +180 @@
-                raise StopIteration
-            for row in rows:
-                if fill_cache:
-
+, self._recurse_fields, self._recurse_depth
-                else:
-                    obj = self.model(*row[:index_end])
-                for i, k in enumerate(extra_select):
@@ -194 +196 @@
-        counter._select_related = False
-        select, sql, params = counter._get_sql_clause()
-        cursor = connection.cursor()
+        id_col = "%s.%s" % (backend.quote_name(self.model._meta.db_table),
+                backend.quote_name(self.model._meta.pk.column))
-        if self._distinct:
-            id_col = "%s.%s" % (backend.quote_name(self.model._meta.db_table),
-                    backend.quote_name(self.model._meta.pk.column))
-            cursor.execute("SELECT COUNT(DISTINCT(%s))" % id_col + sql, params)
-        else:
-*)"
+%s)" % id_col
-        return cursor.fetchone()[0]
-
-    def get(self, *args, **kwargs):
@@ -359 +361 @@
-        else:
-            return self._filter_or_exclude(None, **filter_obj)
-
-
+
+
+
-        "Returns a new QuerySet instance with '_select_related' modified."
-
+
+
+
-
-    def order_by(self, *field_names):
-        "Returns a new QuerySet instance with the ordering changed."
@@ -395 +401 @@
-        c._filters = self._filters
-        c._order_by = self._order_by
-        c._select_related = self._select_related
+        c._recurse_fields = self._recurse_fields
+        c._recurse_depth = self._recurse_depth
-        c._distinct = self._distinct
-        c._select = self._select.copy()
-        c._where = self._where[:]
@@ -448 +456 @@
-
-        # Add additional tables and WHERE clauses based on select_related.
-        if self._select_related:
-
+, self._recurse_depth, self._recurse_fields
-
-        # Add any additional SELECTs.
-        if self._select:
@@ -660 +668 @@
-        return backend.get_fulltext_search_sql(table_prefix + field_name)
-    raise TypeError, "Got invalid lookup_type: %s" % repr(lookup_type)
-
-
+, fields=[], max_depth=0, cur_depth=0
-    "Helper function that recursively returns an object with cache filled"
+    if max_depth and cur_depth > max_depth:
+        return None
-    index_end = index_start + len(klass._meta.fields)
-    obj = klass(*row[index_start:index_end])
-    for f in klass._meta.fields:
-
-
-
+
+
+
+
+
-    return obj, index_end
-
-
+, max_depth=0, fields=[], cur_depth=0
-    """
-    Helper function that recursively populates the select, tables and where (in
-    place) for select_related queries.
-    """
-    qn = backend.quote_name
+    if max_depth and cur_depth > max_depth:
+        return
-    for f in opts.fields:
-
+ and (fields == [] or (cur_depth == 0 and f.name in fields))
-            db_table = f.rel.to._meta.db_table
-            if db_table not in cache_tables_seen:
-                tables.append(qn(db_table))
@@ -689 +703 @@
-            where.append('%s.%s = %s.%s' % \
-                (qn(old_prefix), qn(f.column), qn(db_table), qn(f.rel.get_related_field().column)))
-            select.extend(['%s.%s' % (qn(db_table), qn(f2.column)) for f2 in f.rel.to._meta.fields])
-
+, max_depth, fields, cur_depth+1
-
-def parse_lookup(kwarg_items, opts):
-    # Helper function that handles converting API kwargs