Fixed a bug where signals wouldn't get setup properly, especially on RealTimeSearchIndex. Thanks to byoungb for the report!

Author: toastdriven

haystack/utils/loading.py

@@ -93,7 +93,7 @@ def __getitem__(self, key):
         return self._connections[key]
 
     def all(self):
-        return [self[alias] for alias in self._connections]
+        return [self[alias] for alias in self.connections_info]
 
 
 class ConnectionRouter(object):
@@ -133,6 +133,7 @@ def __init__(self):
         self.indexes = {}
         self.fields = SortedDict()
         self._built = False
+        self._indexes_setup = False
         self.excluded_indexes = getattr(settings, 'HAYSTACK_EXCLUDED_INDEXES', [])
         self.document_field = getattr(settings, 'HAYSTACK_DOCUMENT_FIELD', 'text')
         self._fieldnames = {}
@@ -250,10 +251,15 @@ def collect_fields(self, index):
     def setup_indexes(self):
         if not self._built:
             self.build()
-        
+
+        if self._indexes_setup:
+            return
+
         for model_ct, index in self.indexes.items():
             index._setup_save()
             index._setup_delete()
+
+        self._indexes_setup = True
 
     def teardown_indexes(self):
         if not self._built:
@@ -262,6 +268,8 @@ def teardown_indexes(self):
         for model_ct, index in self.indexes.items():
             index._teardown_save()
             index._teardown_delete()
+
+        self._indexes_setup = False
 
     def get_indexed_models(self):
         if not self._built:

tests/discovery/tests.py

@@ -44,6 +44,9 @@ def test_discovery(self):
         connections['default']._index = old_ui
 
     def test_signal_setup_handling(self):
+        old_ui = connections['default'].get_unified_index()
+        connections['default']._index = UnifiedIndex()
+        self.assertEqual(connections['default'].get_unified_index()._indexes_setup, False)
         foo_1 = Foo.objects.create(
             title='chekin sigalz',
             body='stuff'
@@ -56,12 +59,15 @@ def test_signal_setup_handling(self):
         existing_foo = sqs.filter(id='discovery.foo.1')[0]
         self.assertEqual(existing_foo.text, u'stuff')
 
+        fi.clear()
         foo_1 = Foo.objects.get(pk=1)
         foo_1.title = 'Checking signals'
         foo_1.body = 'Stuff.'
         # This save should trigger an update.
         foo_1.save()
+        self.assertEqual(connections['default'].get_unified_index()._indexes_setup, True)
 
         sqs = SearchQuerySet()
         new_foo = sqs.filter(id='discovery.foo.1')[0]
         self.assertEqual(new_foo.text, u'Stuff.')
+        connections['default']._index = old_ui