encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-25 00:34:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactoring of must_call_distinct (#4215)

Browse Source
This commit is contained in:
Tom Christie 2016-06-23 14:02:25 +01:00 committed by GitHub
parent 90bb0c58ce
commit e1f7cc4082
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rest_framework/filters.py
View File

@ -156,14 +156,15 @@ class SearchFilter(BaseFilterBackend):
lookup = 'icontains' lookup = 'icontains'
return LOOKUP_SEP.join([field_name, lookup]) return LOOKUP_SEP.join([field_name, lookup])
def must_call_distinct(self, opts, lookups): def must_call_distinct(self, queryset, search_fields):
""" """
Return True if 'distinct()' should be used to query the given lookups. Return True if 'distinct()' should be used to query the given lookups.
""" """
for lookup in lookups: opts = queryset.model._meta
if lookup[0] in self.lookup_prefixes: for search_field in search_fields:
lookup = lookup[1:] if search_field[0] in self.lookup_prefixes:
parts = lookup.split(LOOKUP_SEP) search_field = search_field[1:]
parts = search_field.split(LOOKUP_SEP)
for part in parts: for part in parts:
field = opts.get_field(part) field = opts.get_field(part)
if hasattr(field, 'get_path_info'): if hasattr(field, 'get_path_info'):
@ -195,10 +196,11 @@ class SearchFilter(BaseFilterBackend):
] ]
queryset = queryset.filter(reduce(operator.or_, queries)) queryset = queryset.filter(reduce(operator.or_, queries))
if self.must_call_distinct(queryset.model._meta, search_fields): if self.must_call_distinct(queryset, search_fields):
# Filtering against a many-to-many field requires us to # Filtering against a many-to-many field requires us to
# call queryset.distinct() in order to avoid duplicate items # call queryset.distinct() in order to avoid duplicate items
# in the resulting queryset. # in the resulting queryset.
# We try to avoid this is possible, for performance reasons.
queryset = distinct(queryset, base) queryset = distinct(queryset, base)
return queryset return queryset