Fixed a backward-incompatible query syntax change Whoosh introduced between 1.6.1 & 1.6.2 that causes only one model to appear as though it is indexed.

Author: toastdriven

haystack/backends/whoosh_backend.py

@@ -304,7 +304,7 @@ def search(self, query_string, sort_by=None, start_offset=0, end_offset=None,
             registered_models = self.build_models_list()
 
             if len(registered_models) > 0:
-                narrow_queries.add('%s:(%s)' % (DJANGO_CT, ' OR '.join(registered_models)))
+                narrow_queries.add(' OR '.join(['%s:%s' % (DJANGO_CT, rm) for rm in registered_models]))
 
         narrow_searcher = None
 

tests/whoosh_tests/tests/whoosh_backend.py

@@ -24,6 +24,18 @@ def get_model(self):
         return MockModel
 
 
+class WhooshAnotherMockSearchIndex(indexes.SearchIndex):
+    text = indexes.CharField(document=True)
+    name = indexes.CharField(model_attr='author')
+    pub_date = indexes.DateField(model_attr='pub_date')
+    
+    def get_model(self):
+        return AnotherMockModel
+    
+    def prepare_text(self, obj):
+        return obj.author
+
+
 class AllTypesWhooshMockSearchIndex(indexes.SearchIndex):
     text = indexes.CharField(document=True, use_template=True)
     name = indexes.CharField(model_attr='author', indexed=False)
@@ -217,6 +229,17 @@ def test_search(self):
         # Restore.
         settings.HAYSTACK_LIMIT_TO_REGISTERED_MODELS = old_limit_to_registered_models
 
+    def test_search_all_models(self):
+        wamsi = WhooshAnotherMockSearchIndex()
+        self.ui.build(indexes=[self.wmmi, wamsi])
+        
+        self.sb.update(self.wmmi, self.sample_objs)
+        self.sb.update(wamsi, AnotherMockModel.objects.all())
+        
+        self.assertEqual(len(self.whoosh_search(u'*')), 25)
+        
+        self.ui.build(indexes=[self.wmmi])
+    
     def test_more_like_this(self):
         self.sb.update(self.wmmi, self.sample_objs)
         self.assertEqual(len(self.whoosh_search(u'*')), 23)
@@ -710,6 +733,57 @@ def test_result_class(self):
         self.assertTrue(isinstance(sqs[0], SearchResult))
 
 
+class LiveWhooshMultiSearchQuerySetTestCase(TestCase):
+    fixtures = ['bulk_data.json']
+    
+    def setUp(self):
+        super(LiveWhooshMultiSearchQuerySetTestCase, self).setUp()
+        
+        # Stow.
+        temp_path = os.path.join('tmp', 'test_whoosh_query')
+        self.old_whoosh_path = settings.HAYSTACK_CONNECTIONS['default']['PATH']
+        settings.HAYSTACK_CONNECTIONS['default']['PATH'] = temp_path
+        
+        self.old_ui = connections['default'].get_unified_index()
+        self.ui = UnifiedIndex()
+        self.wmmi = WhooshMockSearchIndex()
+        self.wamsi = WhooshAnotherMockSearchIndex()
+        self.ui.build(indexes=[self.wmmi, self.wamsi])
+        self.sb = connections['default'].get_backend()
+        connections['default']._index = self.ui
+        
+        self.sb.setup()
+        self.raw_whoosh = self.sb.index
+        self.parser = QueryParser(self.sb.content_field_name, schema=self.sb.schema)
+        self.sb.delete_index()
+        
+        self.wmmi.update()
+        self.wamsi.update()
+        
+        self.sqs = SearchQuerySet()
+    
+    def tearDown(self):
+        if os.path.exists(settings.HAYSTACK_CONNECTIONS['default']['PATH']):
+            shutil.rmtree(settings.HAYSTACK_CONNECTIONS['default']['PATH'])
+        
+        settings.HAYSTACK_CONNECTIONS['default']['PATH'] = self.old_whoosh_path
+        connections['default']._index = self.old_ui
+        super(LiveWhooshMultiSearchQuerySetTestCase, self).tearDown()
+    
+    def test_searchquerysets_with_models(self):
+        sqs = self.sqs.all()
+        self.assertEqual(sqs.query.build_query(), u'*')
+        self.assertEqual(len(sqs), 25)
+        
+        sqs = self.sqs.models(MockModel)
+        self.assertEqual(sqs.query.build_query(), u'django_ct:core.mockmodel')
+        self.assertEqual(len(sqs), 23)
+        
+        sqs = self.sqs.models(AnotherMockModel)
+        self.assertEqual(sqs.query.build_query(), u'django_ct:core.anothermockmodel')
+        self.assertEqual(len(sqs), 2)
+
+
 class LiveWhooshAutocompleteTestCase(TestCase):
     fixtures = ['bulk_data.json']