mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 02:39:12 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: For custom Q-like objects, pass in the used_aliases

Browse Source 
parameter (see [7462]) from Query.add_q() to their add_to_query() method. This
provides custom objects with the same context as Q's.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-04-26 05:06:21 +00:00
parent 67bfd15c47
commit dd432cc941
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/sql/query.py
View File

@ -1008,9 +1008,11 @@ class Query(object):
Can also be used to add anything that has an 'add_to_query()' method. Can also be used to add anything that has an 'add_to_query()' method.
""" """
if used_aliases is None:
used_aliases = set()
if hasattr(q_object, 'add_to_query'): if hasattr(q_object, 'add_to_query'):
# Complex custom objects are responsible for adding themselves. # Complex custom objects are responsible for adding themselves.
q_object.add_to_query(self) q_object.add_to_query(self, used_aliases)
return return
if self.where and q_object.connector != AND and len(q_object) > 1: if self.where and q_object.connector != AND and len(q_object) > 1:
@ -1019,8 +1021,6 @@ class Query(object):
else: else:
subtree = False subtree = False
connector = AND connector = AND
if used_aliases is None:
used_aliases = set()
for child in q_object.children: for child in q_object.children:
if isinstance(child, Node): if isinstance(child, Node):
self.where.start_subtree(connector) self.where.start_subtree(connector)