Changeset 6957

Timestamp:

12/19/07 04:57:54 (7 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Fixed a problem when adding certain additional filters to a queryset that has precisely one filter attached already.

Refs #6154.

Files:

• django/branches/queryset-refactor/django/db/models/sql/query.py (modified) (2 diffs)
• django/branches/queryset-refactor/django/utils/tree.py (modified) (1 diff)
• django/branches/queryset-refactor/tests/regressiontests/queries/models.py (modified) (1 diff)

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

@@ -793 +793 @@
-            return
-
+        if self.where and q_object.connector != AND and len(q_object) > 1:
+            self.where.start_subtree(AND)
+            subtree = True
+        else:
+            subtree = False
-        for child in q_object.children:
-            if isinstance(child, Node):
@@ -800 +805 @@
-            else:
-                self.add_filter(child, q_object.connector, q_object.negated)
+        if subtree:
+            self.where.end_subtree()
-
-    def setup_joins(self, names, opts, alias, dupe_multis):

django/branches/queryset-refactor/django/utils/tree.py

@@ -88 +88 @@
-        """
-        Sets up internal state so that new nodes are added to a subtree of the
-is required so that the new subtree is
-connected correctly to any existing nodes in the tree
+specifies how the sub-tree is joined to the
+existing children
-        """
-        if len(self.children) == 1:

django/branches/queryset-refactor/tests/regressiontests/queries/models.py

@@ -460 +460 @@
-[<Item: four>]
-
+Bug #6154
+Multiple filter statements are joined using "AND" all the time.
+
+>>> Author.objects.filter(id=a1.id).filter(Q(extra__note=n1)|Q(item__note=n3))
+[<Author: a1>]
+>>> Author.objects.filter(Q(extra__note=n1)|Q(item__note=n3)).filter(id=a1.id)
+[<Author: a1>]
-"""}
-