mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Revert "Fixed #21241 -- Avoid extraneous JOINs in admin changelist search."

Browse Source 
This reverts commit 698dd82eee.

The patch introduced a backward incompatible change.
This commit is contained in:
Simon Charette
2013-10-07 13:38:15 -04:00
parent 259a6ea82c
commit a8df8e34f9
2 changed files with 3 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/contrib/admin/options.py
View File

@@ -849,14 +849,10 @@ class ModelAdmin(BaseModelAdmin):
if search_fields and search_term:
orm_lookups = [construct_search(str(search_field))
for search_field in search_fields]
query_parts = []
for bit in search_term.split():
or_queries = (models.Q(**{orm_lookup: bit})
for orm_lookup in orm_lookups)
query_parts.append(reduce(operator.or_, or_queries))
queryset = queryset.filter(reduce(operator.and_, query_parts))
or_queries = [models.Q(**{orm_lookup: bit})
for orm_lookup in orm_lookups]
queryset = queryset.filter(reduce(operator.or_, or_queries))
if not use_distinct:
for search_spec in orm_lookups:
if lookup_needs_distinct(self.opts, search_spec):