Fixed a bug where RealTimeSearchIndex was erroneously included in index discovery. Thanks to dedsm for the report & original patch!

Author: toastdriven

haystack/utils/loading.py

@@ -139,8 +139,14 @@ def __init__(self):
         self._facet_fieldnames = {}
 
     def collect_indexes(self):
-        from haystack.indexes import SearchIndex, BasicSearchIndex, ModelSearchIndex
-        base_classes = [Indexable, SearchIndex, BasicSearchIndex, ModelSearchIndex]
+        from haystack.indexes import SearchIndex, BasicSearchIndex, ModelSearchIndex, RealTimeSearchIndex
+        ignored_classes = [
+            Indexable,
+            SearchIndex,
+            BasicSearchIndex,
+            ModelSearchIndex,
+            RealTimeSearchIndex
+        ]
         indexes = []
 
         for app in settings.INSTALLED_APPS:
@@ -150,7 +156,7 @@ def collect_indexes(self):
                 continue
 
             for item_name, item in inspect.getmembers(search_index_module, inspect.isclass):
-                if not item in base_classes and issubclass(item, Indexable):
+                if not item in ignored_classes and issubclass(item, Indexable):
                     # We've got an index. Check if we should be ignoring it.
                     class_path = "%s.search_indexes.%s" % (app, item_name)
 

tests/multipleindex/search_indexes.py

@@ -2,6 +2,14 @@
 from multipleindex.models import Foo, Bar
 
 
+# To test additional ignores...
+class BaseIndex(indexes.SearchIndex):
+    text = indexes.CharField(document=True, model_attr='body')
+    
+    def get_model(self):
+        return Foo
+
+
 class FooIndex(indexes.SearchIndex):
     text = indexes.CharField(document=True, model_attr='body')
 
@@ -10,7 +18,7 @@ def get_model(self):
 
 
 # Import the old way & make sure things don't explode.
-from haystack.indexes import SearchIndex
+from haystack.indexes import SearchIndex, RealTimeSearchIndex
 
 
 class BarIndex(indexes.SearchIndex):

tests/multipleindex_settings.py

@@ -15,3 +15,8 @@
         'PATH': os.path.join('tmp', 'test_whoosh_query'),
     },
 }
+
+HAYSTACK_EXCLUDED_INDEXES = [
+    'multipleindex.search_indexes.BaseIndex',
+]
+