Merge pull request django-haystack#1721 from fakhar362/issues/default-alias

Fixed hardcoded default connection alias

Author: acdha

haystack/admin.py

@@ -8,13 +8,14 @@
 from django.utils.translation import ungettext
 
 from haystack import connections
+from haystack.constants import DEFAULT_ALIAS
 from haystack.query import SearchQuerySet
 from haystack.utils import get_model_ct_tuple
 
 
 class SearchChangeList(ChangeList):
     def __init__(self, **kwargs):
-        self.haystack_connection = kwargs.pop("haystack_connection", "default")
+        self.haystack_connection = kwargs.pop("haystack_connection", DEFAULT_ALIAS)
         super(SearchChangeList, self).__init__(**kwargs)
 
     def get_results(self, request):
@@ -58,7 +59,7 @@ def get_results(self, request):
 
 class SearchModelAdminMixin(object):
     # haystack connection to use for searching
-    haystack_connection = "default"
+    haystack_connection = DEFAULT_ALIAS
 
     @csrf_protect_m
     def changelist_view(self, request, extra_context=None):

haystack/management/commands/haystack_info.py

@@ -2,6 +2,7 @@
 from django.core.management.base import BaseCommand
 
 from haystack import connections
+from haystack.constants import DEFAULT_ALIAS
 
 
 class Command(BaseCommand):
@@ -10,7 +11,7 @@ class Command(BaseCommand):
     def handle(self, **options):
         """Provides feedback about the current Haystack setup."""
 
-        unified_index = connections["default"].get_unified_index()
+        unified_index = connections[DEFAULT_ALIAS].get_unified_index()
         indexed = unified_index.get_indexed_models()
         index_count = len(indexed)
         self.stdout.write("Number of handled %s index(es)." % index_count)

haystack/models.py

@@ -5,6 +5,7 @@
 from django.utils.encoding import force_str
 from django.utils.text import capfirst
 
+from haystack.constants import DEFAULT_ALIAS
 from haystack.exceptions import NotHandled, SpatialError
 from haystack.utils import log as logging
 from haystack.utils.app_loading import haystack_get_model
@@ -67,7 +68,7 @@ def __getattr__(self, attr):
     def _get_searchindex(self):
         from haystack import connections
 
-        return connections["default"].get_unified_index().get_index(self.model)
+        return connections[DEFAULT_ALIAS].get_unified_index().get_index(self.model)
 
     searchindex = property(_get_searchindex)
 
@@ -212,7 +213,7 @@ def get_stored_fields(self):
             from haystack import connections
 
             try:
-                index = connections["default"].get_unified_index().get_index(self.model)
+                index = connections[DEFAULT_ALIAS].get_unified_index().get_index(self.model)
             except NotHandled:
                 # Not found? Return nothing.
                 return {}