Fix SearchQuerySet to use all given words in db search, adding test.

mkaniaa · mkaniaa · commit 9a55a7bcb2e6 · 2023-11-09T13:20:03.000+01:00
diff --git a/haystack/backends/simple_backend.py b/haystack/backends/simple_backend.py
@@ -1,3 +1,4 @@
+# encoding: utf-8
 """
 A very basic, ORM-based backend for simple search during tests.
 """
@@ -35,7 +36,7 @@ def search(self, query_string, **kwargs):
         results = []
         result_class = SearchResult
         models = (
-            connections[self.connection_alias].get_unified_index().get_indexed_models()
+            connections[self.connection_alias].get_unified_index().get_indexed_models(),
         )
 
         if kwargs.get("result_class"):
@@ -46,9 +47,8 @@ def search(self, query_string, **kwargs):
 
         if query_string:
             for model in models:
-                if query_string == "*":
-                    qs = model.objects.all()
-                else:
+                qs = model.objects.all()
+                if query_string != "*":
                     for term in query_string.split():
                         queries = []
 
@@ -66,19 +66,21 @@ def search(self, query_string, **kwargs):
                             queries.append(Q(**{"%s__icontains" % field.name: term}))
 
                         if queries:
-                            qs = model.objects.filter(
-                                reduce(lambda x, y: x | y, queries)
-                            )
+                            qs = qs.filter(reduce(lambda x, y: x | y, queries))
                         else:
-                            qs = []
+                            qs = qs.none()
 
                 hits += len(qs)
 
                 for match in qs:
                     match.__dict__.pop("score", None)
                     app_label, model_name = get_model_ct_tuple(match)
                     result = result_class(
-                        app_label, model_name, match.pk, 0, **match.__dict__
+                        app_label,
+                        model_name,
+                        match.pk,
+                        0,
+                        **match.__dict__,
                     )
                     # For efficiency.
                     result._model = match.__class__
diff --git a/test_haystack/core/fixtures/bulk_data.json b/test_haystack/core/fixtures/bulk_data.json
@@ -231,7 +231,7 @@
         "model": "core.mockmodel",
         "fields": {
             "author": "daniel3",
-            "foo": "Each SearchIndex gets a prepare method, which handles collecting all the data. This method should return a dictionary that will be the final data used by the search backend. Overriding this method is useful if you need to collect more than one piece of data or need to incorporate additional data that is not well represented by a single SearchField. An example might look like:",
+            "foo": "Uniqueness. Each SearchIndex gets a prepare method, which handles collecting all the data. This method should return a dictionary that will be the final data used by the search backend. Overriding this method is useful if you need to collect more than one piece of data or need to incorporate additional data that is not well represented by a single SearchField. An example might look like:",
             "pub_date": "2009-07-17 20:30:00",
             "tag": 1
         }
diff --git a/test_haystack/simple_tests/test_simple_backend.py b/test_haystack/simple_tests/test_simple_backend.py
@@ -111,10 +111,10 @@ def test_search(self):
             self.backend.search("should be a string")["results"][0].score, 0
         )
 
-        self.assertEqual(self.backend.search("index document")["hits"], 6)
+        self.assertEqual(self.backend.search("index document")["hits"], 5)
         self.assertEqual(
             [result.pk for result in self.backend.search("index document")["results"]],
-            [2, 3, 15, 16, 17, 18],
+            [2, 3, 15, 17, 18],
         )
 
         # Regression-ville
@@ -123,7 +123,7 @@ def test_search(self):
                 result.object.id
                 for result in self.backend.search("index document")["results"]
             ],
-            [2, 3, 15, 16, 17, 18],
+            [2, 3, 15, 17, 18],
         )
         self.assertEqual(
             self.backend.search("index document")["results"][0].model, MockModel
@@ -193,6 +193,10 @@ def test_search(self):
             {"hits": 0, "results": []},
         )
 
+        # Search by string containing more than one word.
+        self.assertEqual(self.backend.search("uniqueness index")["hits"], 1)
+        self.assertEqual(self.backend.search("uniqueness index")["results"][0].pk, 23)
+
     def test_filter_models(self):
         self.backend.update(self.index, self.sample_objs)
         self.assertEqual(self.backend.search("*", models=set([]))["hits"], 24)

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@`
`231`	`231`	`"model": "core.mockmodel",`
`232`	`232`	`"fields": {`
`233`	`233`	`"author": "daniel3",`
`234`		`- "foo": "Each SearchIndex gets a prepare method, which handles collecting all the data. This method should return a dictionary that will be the final data used by the search backend. Overriding this method is useful if you need to collect more than one piece of data or need to incorporate additional data that is not well represented by a single SearchField. An example might look like:",`
	`234`	`+ "foo": "Uniqueness. Each SearchIndex gets a prepare method, which handles collecting all the data. This method should return a dictionary that will be the final data used by the search backend. Overriding this method is useful if you need to collect more than one piece of data or need to incorporate additional data that is not well represented by a single SearchField. An example might look like:",`
`235`	`235`	`"pub_date": "2009-07-17 20:30:00",`
`236`	`236`	`"tag": 1`
`237`	`237`	`}`