Only split search terms when testing for 'contains'

Author: dbramwell

django_select2/forms.py

@@ -47,7 +47,6 @@
 
 """
 import uuid
-from functools import reduce
 from itertools import chain
 from pickle import PicklingError  # nosec
 
@@ -399,16 +398,18 @@ def filter_queryset(self, request, term, queryset=None, **dependent_fields):
         select = Q()
         term = term.replace("\t", " ")
         term = term.replace("\n", " ")
-        for t in [t for t in term.split(" ") if not t == ""]:
-            select &= reduce(
-                lambda x, y: x | Q(**{y: t}),
-                search_fields[1:],
-                Q(**{search_fields[0]: t}),
-            )
-        select |= Q(**{search_fields[0]: term})
+
+        for field in search_fields:
+            field_select = Q()
+            if "contains" in field:
+                for t in [t for t in term.split(" ") if not t == ""]:
+                    field_select &= Q(**{field: t})
+            else:
+                field_select = Q(**{field: term})
+            select |= field_select
+
         if dependent_fields:
             select &= Q(**dependent_fields)
-
         return queryset.filter(select).distinct()
 
     def get_queryset(self):

tests/test_forms.py

@@ -454,11 +454,12 @@ def test_starts_with_filter_queryset(self, genres):
         widget = TitleModelSelect2Widget(
             search_fields=["title__istartswith"], queryset=Genre.objects.all()
         )
-        qs = widget.filter_queryset(
-            None, "Space Gen"
-        )
+        qs = widget.filter_queryset(None, "Space Gen")
         assert qs.exists()
 
+        qs = widget.filter_queryset(None, "Gen")
+        assert not qs.exists()
+
     def test_model_kwarg(self):
         widget = ModelSelect2Widget(model=Genre, search_fields=["title__icontains"])
         genre = Genre.objects.last()