innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #8283 -- Fixed an edge case when adding things to the "where" tree and 

combining different connector types.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-08-16 20:40:00 +00:00
parent 4dece4fba1
commit c127f0117d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/tree.py
View File

@ -87,7 +87,7 @@ class Node(object):
Otherwise, the whole tree is pushed down one level and a new root Otherwise, the whole tree is pushed down one level and a new root
connector is created, connecting the existing tree and the new node. 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 return
if len(self.children) < 2: if len(self.children) < 2:
self.connector = conn_type self.connector = conn_type

6
tests/regressiontests/queries/models.py
View File

@ -891,6 +891,12 @@ True
>>> Celebrity.objects.count() == num_celebs >>> Celebrity.objects.count() == num_celebs
True 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 # In Python 2.3, exceptions raised in __len__ are swallowed (Python issue