Make sure DJANGO_CT and DJANGO_ID fields are not analyzed

Author: CubeXspark

haystack/backends/elasticsearch_backend.py

@@ -614,7 +614,10 @@ def _process_results(self, raw_results, highlight=False,
 
     def build_schema(self, fields):
         content_field_name = ''
-        mapping = {}
+        mapping = {
+            DJANGO_CT: {'type': 'string', 'index': 'not_analyzed', 'include_in_all': False},
+            DJANGO_ID: {'type': 'string', 'index': 'not_analyzed', 'include_in_all': False},
+        }
 
         for field_name, field_class in fields.items():
             field_mapping = FIELD_MAPPINGS.get(field_class.field_type, DEFAULT_FIELD_MAPPING).copy()

tests/elasticsearch_tests/tests/test_elasticsearch_backend.py

@@ -438,8 +438,10 @@ def test_build_schema(self):
 
         (content_field_name, mapping) = self.sb.build_schema(old_ui.all_searchfields())
         self.assertEqual(content_field_name, 'text')
-        self.assertEqual(len(mapping), 4)
+        self.assertEqual(len(mapping), 4+2) # +2 management fields
         self.assertEqual(mapping, {
+            'django_id': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+            'django_ct': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
             'text': {'type': 'string', 'analyzer': 'snowball'},
             'pub_date': {'type': 'date'},
             'name': {'type': 'string', 'analyzer': 'snowball'},
@@ -450,8 +452,10 @@ def test_build_schema(self):
         ui.build(indexes=[ElasticsearchComplexFacetsMockSearchIndex()])
         (content_field_name, mapping) = self.sb.build_schema(ui.all_searchfields())
         self.assertEqual(content_field_name, 'text')
-        self.assertEqual(len(mapping), 15)
+        self.assertEqual(len(mapping), 15+2) # +2 management fields
         self.assertEqual(mapping, {
+            'django_id': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+            'django_ct': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
             'name': {'type': 'string', 'analyzer': 'snowball'},
             'is_active_exact': {'type': 'boolean'},
             'created': {'type': 'date'},
@@ -1068,6 +1072,8 @@ def test_build_schema(self):
         self.sb = connections['default'].get_backend()
         content_name, mapping = self.sb.build_schema(self.ui.all_searchfields())
         self.assertEqual(mapping, {
+            'django_id': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
+            'django_ct': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False},
             'name_auto': {
                 'type': 'string',
                 'analyzer': 'edgengram_analyzer',