Commit 36cb4383 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7312 -- Fixed handling of custom Q-like objects in QuerySet.custom_filter(). 

This is pretty much internal-use-only code, so doesn't affect public API at
all, but it's nice to be able to handle things properly in any case. Patch from
emulbreh.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9e23c3c5

django/db/models/query.py

+3 −1
Original line number Diff line number Diff line
@@ -492,7 +492,9 @@ class QuerySet(object): 
        and usually it will be more natural to use other methods.

        """

        if isinstance(filter_obj, Q) or hasattr(filter_obj, 'add_to_query'):

            return self._filter_or_exclude(None, filter_obj)

            clone = self._clone()

            clone.query.add_q(filter_obj)

            return clone

        else:

            return self._filter_or_exclude(None, **filter_obj)