Merge pull request #7 from evilkost/master

bugfix: flask-whooshee invoked whoosh searcher without `limit`, so whoosh  used defalt limit value == 10

flask_whooshee.py

@@ -15,14 +15,16 @@ class WhoosheeQuery(BaseQuery):
     """An override for SQLAlchemy query used to do fulltext search."""
 
     # TODO: add an option to override used Whoosheer
-    def whooshee_search(self, search_string, group=whoosh.qparser.OrGroup, match_substrings=True):
+    def whooshee_search(self, search_string, group=whoosh.qparser.OrGroup,
+                        match_substrings=True, limit=None):
         """Do a fulltext search on the query.
 
         Args:
             search_string: string to search for
             group: whoosh group to use for searching, defaults to OrGroup (searches for all
                    words in all columns)
             match_substrings: True if you want to match substrings, False otherwise
+            limit: number of the top records to be returned, default None returns all records
 
         Returns:
             query filtered with results of the fulltext search
@@ -52,7 +54,8 @@ def whooshee_search(self, search_string, group=whoosh.qparser.OrGroup, match_sub
         res = whoosheer.search(search_string=search_string,
                                values_of=uniq,
                                group=group,
-                               match_substrings=match_substrings)
+                               match_substrings=match_substrings,
+                               limit=None)
         if not res:
             return self.filter('null')
 
@@ -80,7 +83,7 @@ class AbstractWhoosheer(object):
     """
 
     @classmethod
-    def search(cls, search_string, values_of='', group=whoosh.qparser.OrGroup, match_substrings=True):
+    def search(cls, search_string, values_of='', group=whoosh.qparser.OrGroup, match_substrings=True, limit=None):
         """Actually searches the fields for given search_string.
 
         Args:
@@ -90,14 +93,16 @@ def search(cls, search_string, values_of='', group=whoosh.qparser.OrGroup, match
             group: whoosh group to use for searching, defaults to OrGroup (searches for all
                    words in all columns)
             match_substrings: True if you want to match substrings, False otherwise
+            limit: number of the top records to be returned, default None returns all records
+
         Returns:
             Found records if 'not values_of', else values of given column
         """
         prepped_string = cls.prep_search_string(search_string, match_substrings)
         with cls.index.searcher() as searcher:
             parser = whoosh.qparser.MultifieldParser(cls.schema.names(), cls.index.schema, group=group)
             query = parser.parse(prepped_string)
-            results = searcher.search(query)
+            results = searcher.search(query, limit=limit)
             if values_of:
                 return [x[values_of] for x in results]
             return results

test.py

@@ -113,4 +113,23 @@ def test_cw_result_in_different_tables(self):
         self.assertIn(self.e2, found)
         self.assertIn(self.e4, found)
 
+    def test_more_items(self):
+        expected_count = 0
+        # couldn't test for large set due to some bugs either in sqlite or whoosh or SA
+        # got: OperationalError: (OperationalError) too many SQL variables u'SELECT entry.id
+        #  ... FROM entry \nWHERE entry.id IN (?, ?, .... when whooshee_search is invoked
+        for batch_size in [2, 5, 7, 20, 50, 300, 500]:  # , 1000]:
+            expected_count += batch_size
+            self.entry_list = [
+                self.Entry(title=u'foobar_{}_{}'.format(expected_count, x),
+                           content=u'xxxx', user=self.u1)
+                for x in range(batch_size)
+            ]
+
+            self.db.session.add_all(self.entry_list)
+            self.db.session.commit()
+
+            found = self.Entry.query.whooshee_search('foobar').all()
+            assert len(found) == expected_count
+
     # TODO: more :)