mirror of
https://github.com/django/django.git
synced 2025-07-07 11:19:12 +00:00
queryset-refactor: Fixed a bug in Node.negate() for already negated nodes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
142e400c5c
commit
fdb3209062
@ -80,7 +80,8 @@ class Node(object):
|
|||||||
Interpreting the meaning of this negate is up to client code. This
|
Interpreting the meaning of this negate is up to client code. This
|
||||||
method is useful for implementing "not" arrangements.
|
method is useful for implementing "not" arrangements.
|
||||||
"""
|
"""
|
||||||
self.children = [NegatedNode(self.children, self.connection)]
|
self.children = [NegatedNode(self.children, self.connection,
|
||||||
|
old_state=self.negated)]
|
||||||
self.connection = self.default
|
self.connection = self.default
|
||||||
|
|
||||||
def start_subtree(self, conn_type):
|
def start_subtree(self, conn_type):
|
||||||
@ -117,7 +118,7 @@ class NegatedNode(Node):
|
|||||||
A class that indicates the connection type should be negated (whatever that
|
A class that indicates the connection type should be negated (whatever that
|
||||||
means -- it's up to the client) when used by the client code.
|
means -- it's up to the client) when used by the client code.
|
||||||
"""
|
"""
|
||||||
def __init__(self, children=None, connection=None):
|
def __init__(self, children=None, connection=None, old_state=True):
|
||||||
super(NegatedNode, self).__init__(children, connection)
|
super(NegatedNode, self).__init__(children, connection)
|
||||||
self.negated = True
|
self.negated = not old_state
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user