Fixed django-haystack#575 & django-haystack#838, where a change in Whoosh 2.5>

required explicitly setting the Searcher.search() limit
to None to restore correct results.

Thanks to scenable and Shige Abe (typeshige) for
the initial reports, and to scenable for finding
the root issue in Whoosh.

Author: kezabelle

haystack/backends/whoosh_backend.py

@@ -379,7 +379,8 @@ def search(self, query_string, sort_by=None, start_offset=0, end_offset=None,
             narrow_searcher = self.index.searcher()
 
             for nq in narrow_queries:
-                recent_narrowed_results = narrow_searcher.search(self.parser.parse(force_text(nq)))
+                recent_narrowed_results = narrow_searcher.search(self.parser.parse(force_text(nq)),
+                                                                 limit=None)
 
                 if len(recent_narrowed_results) <= 0:
                     return {
@@ -507,7 +508,8 @@ def more_like_this(self, model_instance, additional_query_string=None,
             narrow_searcher = self.index.searcher()
 
             for nq in narrow_queries:
-                recent_narrowed_results = narrow_searcher.search(self.parser.parse(force_text(nq)))
+                recent_narrowed_results = narrow_searcher.search(self.parser.parse(force_text(nq)),
+                                                                 limit=None)
 
                 if len(recent_narrowed_results) <= 0:
                     return {

tests/whoosh_tests/tests/test_whoosh_backend.py

@@ -814,9 +814,6 @@ def tearDown(self):
         connections['default']._index = self.old_ui
         super(LiveWhooshMultiSearchQuerySetTestCase, self).tearDown()
 
-    # We expect failure here because, despite not changing the code, Whoosh
-    # 2.5.1 returns incorrect counts/results. Huzzah.
-    @unittest.expectedFailure
     def test_searchquerysets_with_models(self):
         sqs = self.sqs.all()
         self.assertEqual(sqs.query.build_query(), u'*')