Skip to content

fix DISTINCT for Oracle databases #2935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
trollknurr wants to merge 6 commits into from
Closed

fix DISTINCT for Oracle databases #2935

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7813d2f
fix DISTINCT for Oracle databases
trollknurr May 14, 2015
c47ec60
no need to do distinct on every loop cycle & add analogue of distinct…
trollknurr May 14, 2015
de95598
removed using `view.model.objects`
trollknurr May 15, 2015
0906bf2
fix empty and_query
trollknurr May 15, 2015
745d8d0
added comment
Jun 3, 2015
e8b23c4
thin logic
Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed using view.model.objects
  • Loading branch information
@trollknurr
trollknurr committed May 15, 2015
commit de95598a1ed7f1b609b9dbc6415655be65fae4a8
13 changes: 6 additions & 7 deletions rest_framework/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,17 @@ def filter_queryset(self, request, queryset, view):

orm_lookups = [self.construct_search(six.text_type(search_field))
for search_field in search_fields]

and_queries = []
Copy link
Contributor

@lovelydinosaur lovelydinosaur May 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand the motivation here - feels more obscure after this change rather than more clear.

Copy link
Contributor Author

@trollknurr trollknurr May 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't sure, if calling queryset.filter(pk_in=set(pk_list)) will make duplications go away, as they pk still will be in pk_list. I want to filter original queryset by pk_list.
When we call filter with multiple kwargs or several times on one queryset it is equal to logical and.

for search_term in self.get_search_terms(request):
or_queries = [models.Q(**{orm_lookup: search_term})
for orm_lookup in orm_lookups]
queryset = queryset.filter(reduce(operator.or_, or_queries))
and_queries.append(reduce(operator.or_, or_queries))

if settings.DATABASES[queryset.db]["ENGINE"] != "django.db.backends.oracle":
queryset = queryset.distinct()
if settings.DATABASES[queryset.db]["ENGINE"] == "django.db.backends.oracle":
pk_list = queryset.filter(reduce(operator.and_, and_queries)).values_list('pk', flat=True)
return queryset.filter(pk__in=frozenset(pk_list))
else:
pk_list = queryset.values_list('pk', flat=True)
queryset = view.model.objects.filter(pk__in=set(pk_list))
return queryset
return queryset.filter(reduce(operator.and_, and_queries)).distinct()


class OrderingFilter(BaseFilterBackend):
Expand Down