Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

queryset-refactor: Fixed a problem when adding certain additional fil…

…ters to a queryset that has precisely one filter attached already.

Refs #6154.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 519178154be44da2ece9ee9609a0217008616454 1 parent 9709194
@malcolmt malcolmt authored
View
7 django/db/models/sql/query.py
@@ -792,6 +792,11 @@ def add_q(self, q_object):
q_object.add_to_query(self)
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):
self.where.start_subtree(q_object.connector)
@@ -799,6 +804,8 @@ def add_q(self, q_object):
self.where.end_subtree()
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):
"""
View
4 django/utils/tree.py
@@ -87,8 +87,8 @@ def negate(self):
def start_subtree(self, conn_type):
"""
Sets up internal state so that new nodes are added to a subtree of the
- current node. The conn_type is required so that the new subtree is
- connected correctly to any existing nodes in the tree.
+ current node. The conn_type specifies how the sub-tree is joined to the
+ existing children.
"""
if len(self.children) == 1:
self.connector = conn_type
View
7 tests/regressiontests/queries/models.py
@@ -459,5 +459,12 @@ class Y(models.Model):
>>> Item.objects.extra(select={'count': 'select count(*) from queries_item_tags where queries_item_tags.item_id = queries_item.id'}).filter(count=1)
[<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>]
"""}
Please sign in to comment.
Something went wrong with that request. Please try again.