Changeset 7467

Timestamp:

04/26/08 00:06:21 (2 months ago)

Author:

mtredinnick

Message:

queryset-refactor: For custom Q-like objects, pass in the used_aliases
parameter (see [7462]) from Query.add_q() to their add_to_query() method. This
provides custom objects with the same context as Q's.

Files:

• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (2 diffs)

django/branches/queryset-refactor/django/db/models/sql/query.py

@@ -1009 +1009 @@
-        Can also be used to add anything that has an 'add_to_query()' method.
-        """
+        if used_aliases is None:
+            used_aliases = set()
-        if hasattr(q_object, 'add_to_query'):
-            # Complex custom objects are responsible for adding themselves.
-
+, used_aliases
-            return
-
@@ -1020 +1022 @@
-            subtree = False
-        connector = AND
-        if used_aliases is None:
-            used_aliases = set()
-        for child in q_object.children:
-            if isinstance(child, Node):