Merge pull request django-haystack#840 from postatum/fix_issue_807

Fixed issue django-haystack#807

Author: bigjust

AUTHORS

@@ -84,3 +84,4 @@ Thanks to
     * Pablo SEMINARIO (pabluk) for a docs fix.
     * Eric Thurgood (ethurgood) for a import fix in the Elasticssearch backend.
     * Revolution Systems & The Python Software Foundation for funding a significant portion of the port to Python 3!
+    * Artem Kostiuk (postatum) for patch allowing to search for slash character in ElasticSearch since Lucene 4.0.

haystack/backends/elasticsearch_backend.py

@@ -43,7 +43,7 @@ class ElasticsearchSearchBackend(BaseSearchBackend):
     # The '\\' must come first, so as not to overwrite the other slash replacements.
     RESERVED_CHARACTERS = (
         '\\', '+', '-', '&&', '||', '!', '(', ')', '{', '}',
-        '[', ']', '^', '"', '~', '*', '?', ':',
+        '[', ']', '^', '"', '~', '*', '?', ':', '/',
     )
 
     # Settings to add an n-gram & edge n-gram analyzer.

tests/elasticsearch_tests/tests/elasticsearch_query.py

@@ -23,6 +23,10 @@ def test_build_query_boolean(self):
         self.sq.add_filter(SQ(content=True))
         self.assertEqual(self.sq.build_query(), '(True)')
 
+    def test_regression_slash_search(self):
+        self.sq.add_filter(SQ(content='hello/'))
+        self.assertEqual(self.sq.build_query(), '(hello\\/)')
+
     def test_build_query_datetime(self):
         self.sq.add_filter(SQ(content=datetime.datetime(2009, 5, 8, 11, 28)))
         self.assertEqual(self.sq.build_query(), '(2009-05-08T11:28:00)')
@@ -105,7 +109,7 @@ def test_build_query_wildcard_filter_types(self):
     def test_clean(self):
         self.assertEqual(self.sq.clean('hello world'), 'hello world')
         self.assertEqual(self.sq.clean('hello AND world'), 'hello and world')
-        self.assertEqual(self.sq.clean('hello AND OR NOT TO + - && || ! ( ) { } [ ] ^ " ~ * ? : \ world'), 'hello and or not to \\+ \\- \\&& \\|| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ world')
+        self.assertEqual(self.sq.clean('hello AND OR NOT TO + - && || ! ( ) { } [ ] ^ " ~ * ? : \ / world'), 'hello and or not to \\+ \\- \\&& \\|| \\! \\( \\) \\{ \\} \\[ \\] \\^ \\" \\~ \\* \\? \\: \\\\ \\/ world')
         self.assertEqual(self.sq.clean('so please NOTe i am in a bAND and bORed'), 'so please NOTe i am in a bAND and bORed')
 
     def test_build_query_with_models(self):