Skip to content

Commit b3023de

Browse files
jezdezjezdez
committed
Fixed naming of manager for consistency.
- renamed `HaystackManager` to `SearchIndexManager` - renamed `get_query_set` to `get_search_queryset`
1 parent bf1b482 commit b3023de

3 files changed

Lines changed: 71 additions & 71 deletions

File tree

‎haystack/indexes.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from haystack import connections, connection_router
77
from haystack.constants import ID, DJANGO_CT, DJANGO_ID, Indexable, DEFAULT_ALIAS
88
from haystack.fields import *
9-
from haystack.manager import HaystackManager
9+
from haystack.manager import SearchIndexManager
1010
from haystack.utils import get_identifier, get_facet_field_name
1111

1212

@@ -59,9 +59,9 @@ def __new__(cls, name, bases, attrs):
5959
# Assigning default 'objects' query manager if it does not already exist
6060
if not attrs.has_key('objects'):
6161
try:
62-
attrs['objects'] = HaystackManager(attrs['Meta'].index_label)
62+
attrs['objects'] = SearchIndexManager(attrs['Meta'].index_label)
6363
except (KeyError, AttributeError):
64-
attrs['objects'] = HaystackManager(DEFAULT_ALIAS)
64+
attrs['objects'] = SearchIndexManager(DEFAULT_ALIAS)
6565

6666
return super(DeclarativeMetaclass, cls).__new__(cls, name, bases, attrs)
6767

‎haystack/manager.py‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
11
from haystack.query import SearchQuerySet, EmptySearchQuerySet
22

3-
class HaystackManager(object):
3+
4+
class SearchIndexManager(object):
45
def __init__(self, using=None):
5-
super(HaystackManager, self).__init__()
6+
super(SearchIndexManager, self).__init__()
67
self.using = using
7-
8-
def get_query_set(self):
8+
9+
def get_search_queryset(self):
910
"""Returns a new SearchQuerySet object. Subclasses can override this method
1011
to easily customize the behavior of the Manager.
1112
"""
1213
return SearchQuerySet(using=self.using)
13-
14+
1415
def get_empty_query_set(self):
1516
return EmptySearchQuerySet(using=self.using)
16-
17+
1718
def all(self):
18-
return self.get_query_set()
19-
19+
return self.get_search_queryset()
20+
2021
def none(self):
2122
return self.get_empty_query_set()
22-
23+
2324
def filter(self, *args, **kwargs):
24-
return self.get_query_set().filter(*args, **kwargs)
25-
25+
return self.get_search_queryset().filter(*args, **kwargs)
26+
2627
def exclude(self, *args, **kwargs):
27-
return self.get_query_set().exclude(*args, **kwargs)
28-
28+
return self.get_search_queryset().exclude(*args, **kwargs)
29+
2930
def filter_and(self, *args, **kwargs):
30-
return self.get_query_set().filter_and(*args, **kwargs)
31-
31+
return self.get_search_queryset().filter_and(*args, **kwargs)
32+
3233
def filter_or(self, *args, **kwargs):
33-
return self.get_query_set().filter_or(*args, **kwargs)
34-
34+
return self.get_search_queryset().filter_or(*args, **kwargs)
35+
3536
def order_by(self, *args):
36-
return self.get_query_set().order_by(*args)
37-
37+
return self.get_search_queryset().order_by(*args)
38+
3839
def order_by_distance(self, **kwargs):
39-
return self.get_query_set().order_by_distance(**kwargs)
40-
40+
return self.get_search_queryset().order_by_distance(**kwargs)
41+
4142
def highlight(self):
42-
return self.get_query_set().highlight()
43-
43+
return self.get_search_queryset().highlight()
44+
4445
def boost(self, term, boost):
45-
return self.get_query_set().boost(term, boost)
46-
46+
return self.get_search_queryset().boost(term, boost)
47+
4748
def facet(self, field):
48-
return self.get_query_set().facet(field)
49-
49+
return self.get_search_queryset().facet(field)
50+
5051
def within(self, field, point_1, point_2):
51-
return self.get_query_set().within(field, point_1, point_2)
52-
52+
return self.get_search_queryset().within(field, point_1, point_2)
53+
5354
def dwithin(self, field, point, distance):
54-
return self.get_query_set().dwithin(field, point, distance)
55-
55+
return self.get_search_queryset().dwithin(field, point, distance)
56+
5657
def distance(self, field, point):
57-
return self.get_query_set().distance(field, point)
58-
58+
return self.get_search_queryset().distance(field, point)
59+
5960
def date_facet(self, field, start_date, end_date, gap_by, gap_amount=1):
60-
return self.get_query_set().date_facet(field, start_date, end_date, gap_by, gap_amount=1)
61-
61+
return self.get_search_queryset().date_facet(field, start_date, end_date, gap_by, gap_amount=1)
62+
6263
def query_facet(self, field, query):
63-
return self.get_query_set().query_facet(field, query)
64-
64+
return self.get_search_queryset().query_facet(field, query)
65+
6566
def narrow(self, query):
66-
return self.get_query_set().narrow(query)
67-
67+
return self.get_search_queryset().narrow(query)
68+
6869
def raw_search(self, query_string, **kwargs):
69-
return self.get_query_set().raw_search(query_string, **kwargs)
70-
70+
return self.get_search_queryset().raw_search(query_string, **kwargs)
71+
7172
def load_all(self):
72-
return self.get_query_set().load_all()
73-
73+
return self.get_search_queryset().load_all()
74+
7475
def auto_query(self, query_string, fieldname='content'):
75-
return self.get_query_set().auto_query(query_string, fieldname=fieldname)
76-
76+
return self.get_search_queryset().auto_query(query_string, fieldname=fieldname)
77+
7778
def autocomplete(self, **kwargs):
78-
return self.get_query_set().autocomplete(**kwargs)
79-
79+
return self.get_search_queryset().autocomplete(**kwargs)
80+
8081
def using(self, connection_name):
81-
return self.get_query_set().using(connection_name)
82-
82+
return self.get_search_queryset().using(connection_name)
83+
8384
def count(self):
84-
return self.get_query_set().count()
85-
85+
return self.get_search_queryset().count()
86+
8687
def best_match(self):
87-
return self.get_query_set().best_match()
88-
88+
return self.get_search_queryset().best_match()
89+
8990
def latest(self, date_field):
90-
return self.get_query_set().latest(date_field)
91-
91+
return self.get_search_queryset().latest(date_field)
92+
9293
def more_like_this(self, model_instance):
93-
return self.get_query_set().more_like_this(model_instance)
94-
94+
return self.get_search_queryset().more_like_this(model_instance)
95+
9596
def facet_counts(self):
96-
return self.get_query_set().facet_counts()
97-
97+
return self.get_search_queryset().facet_counts()
98+
9899
def spelling_suggestion(self, preferred_query=None):
99-
return self.get_query_set().spelling_suggestion(preferred_query=None)
100-
100+
return self.get_search_queryset().spelling_suggestion(preferred_query=None)
101+
101102
def values(self, *fields):
102-
return self.get_query_set().values(*fields)
103-
104-
def values_list(self, *fields, **kwargs):
105-
return self.get_query_set().values_list(*fields, **kwargs)
103+
return self.get_search_queryset().values(*fields)
106104

105+
def values_list(self, *fields, **kwargs):
106+
return self.get_search_queryset().values_list(*fields, **kwargs)

‎tests/core/tests/managers.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
from core.tests.views import BasicMockModelSearchIndex, BasicAnotherMockModelSearchIndex
99
from core.tests.mocks import CharPKMockSearchBackend
1010
from haystack.utils.loading import UnifiedIndex
11-
from haystack.manager import HaystackManager
11+
from haystack.manager import SearchIndexManager
1212

13-
class CustomManager(HaystackManager):
13+
class CustomManager(SearchIndexManager):
1414
def filter(self, *args, **kwargs):
15-
return self.get_query_set().filter(content='foo1').filter(*args, **kwargs)
15+
return self.get_search_queryset().filter(content='foo1').filter(*args, **kwargs)
1616

1717
class CustomMockModelIndexWithObjectsManager(BasicMockModelSearchIndex):
1818
objects = CustomManager()

0 commit comments

Comments
 (0)