Skip to content
Browse files

Fixed #8283 -- Fixed an edge case when adding things to the "where" t…

…ree and

combining different connector types.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 4dece4f commit c127f0117d75220e346625cd8a009fb6a317ece1 @malcolmt malcolmt committed
Showing with 7 additions and 1 deletion.
  1. +1 −1 django/utils/tree.py
  2. +6 −0 tests/regressiontests/queries/models.py
View
2 django/utils/tree.py
@@ -87,7 +87,7 @@ def add(self, node, conn_type):
Otherwise, the whole tree is pushed down one level and a new root
connector is created, connecting the existing tree and the new node.
"""
- if node in self.children:
+ if node in self.children and conn_type == self.connector:
return
if len(self.children) < 2:
self.connector = conn_type
View
6 tests/regressiontests/queries/models.py
@@ -891,6 +891,12 @@ class Join(models.Model):
>>> Celebrity.objects.count() == num_celebs
True
+Bug #8283 -- Checking that applying filters after a disjunction works correctly.
+>>> (ExtraInfo.objects.filter(note=n1)|ExtraInfo.objects.filter(info='e2')).filter(note=n1)
+[<ExtraInfo: e1>]
+>>> (ExtraInfo.objects.filter(info='e2')|ExtraInfo.objects.filter(note=n1)).filter(note=n1)
+[<ExtraInfo: e1>]
+
"""}
# In Python 2.3, exceptions raised in __len__ are swallowed (Python issue

0 comments on commit c127f01

Please sign in to comment.
Something went wrong with that request. Please try again.