p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #2038 -- QuerySet._combine now combines where clause. Thanks, graham@darkcoding.net 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-05-31 14:52:33 +00:00
parent 192c726ee6
commit 45518a052b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ class QuerySet(object):
def complex_filter(self, filter_obj): def complex_filter(self, filter_obj):
"""Returns a new QuerySet instance with filter_obj added to the filters. """Returns a new QuerySet instance with filter_obj added to the filters.
filter_obj can be a Q object (has 'get_sql' method) or a dictionary of filter_obj can be a Q object (has 'get_sql' method) or a dictionary of
keyword lookup arguments.""" keyword lookup arguments."""
# This exists to support framework features such as 'limit_choices_to', # This exists to support framework features such as 'limit_choices_to',
# and usually it will be more natural to use other methods. # and usually it will be more natural to use other methods.
@ -380,6 +380,10 @@ class QuerySet(object):
# (so that A.filter(args1) & A.filter(args2) does the same as # (so that A.filter(args1) & A.filter(args2) does the same as
# A.filter(args1).filter(args2) # A.filter(args1).filter(args2)
combined = other._clone() combined = other._clone()
if self._select: combined._select.update(self._select)
if self._where: combined._where.extend(self._where)
if self._params: combined._params.extend(self._params)
if self._tables: combined._tables.extend(self._tables)
# If 'self' is ordered and 'other' isn't, propagate 'self's ordering # If 'self' is ordered and 'other' isn't, propagate 'self's ordering
if (self._order_by is not None and len(self._order_by) > 0) and \ if (self._order_by is not None and len(self._order_by) > 0) and \
(combined._order_by is None or len(combined._order_by) == 0): (combined._order_by is None or len(combined._order_by) == 0):