BACKWARD-INCOMPATIBLE: auto_query has changed so that only double quotes cause exact match searches. Thanks to craigds for the report!

Author: toastdriven

haystack/query.py

@@ -346,21 +346,24 @@ def auto_query(self, query_string):
         clone = self._clone()
 
         # Pull out anything wrapped in quotes and do an exact match on it.
-        quote_regex = re.compile(r'([\'"])(.*?)\1')
-        result = quote_regex.search(query_string)
-        
-        while result is not None:
-            full_match = result.group()
-            query_string = query_string.replace(full_match, '', 1)
-            
-            exact_match = result.groups()[1]
-            clone = clone.filter(content=clone.query.clean(exact_match))
-            
-            # Re-search the string for other exact matches.
-            result = quote_regex.search(query_string)
+        open_quote_position = None
+        non_exact_query = query_string
+
+        for offset, char in enumerate(query_string):
+            if char == '"':
+                if open_quote_position != None:
+                    current_match = non_exact_query[open_quote_position + 1:offset]
+
+                    if current_match:
+                        clone = clone.filter(content=clone.query.clean(current_match))
+
+                    non_exact_query = non_exact_query.replace('"%s"' % current_match, '', 1)
+                    open_quote_position = None
+                else:
+                    open_quote_position = offset
 
         # Pseudo-tokenize the rest of the query.
-        keywords = query_string.split()
+        keywords = non_exact_query.split()
 
         # Loop through keywords and add filters to the query.
         for keyword in keywords:

tests/core/tests/query.py

@@ -507,11 +507,11 @@ def test_auto_query(self):
 
         sqs = self.bsqs.auto_query('test "my thing" search \'moar quotes\' -stuff')
         self.assert_(isinstance(sqs, SearchQuerySet))
-        self.assertEqual(repr(sqs.query.query_filter), '<SQ: AND (content__exact=my thing AND content__exact=moar quotes AND content__exact=test AND content__exact=search AND NOT (content__exact=stuff))>')
+        self.assertEqual(repr(sqs.query.query_filter), "<SQ: AND (content__exact=my thing AND content__exact=test AND content__exact=search AND content__exact='moar AND content__exact=quotes' AND NOT (content__exact=stuff))>")
 
         sqs = self.bsqs.auto_query('test "my thing" search \'moar quotes\' "foo -stuff')
         self.assert_(isinstance(sqs, SearchQuerySet))
-        self.assertEqual(repr(sqs.query.query_filter), '<SQ: AND (content__exact=my thing AND content__exact=moar quotes AND content__exact=test AND content__exact=search AND content__exact="foo AND NOT (content__exact=stuff))>')
+        self.assertEqual(repr(sqs.query.query_filter), '<SQ: AND (content__exact=my thing AND content__exact=test AND content__exact=search AND content__exact=\'moar AND content__exact=quotes\' AND content__exact="foo AND NOT (content__exact=stuff))>')
 
         sqs = self.bsqs.auto_query('test - stuff')
         self.assert_(isinstance(sqs, SearchQuerySet))

tests/solr_tests/tests/solr_backend.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 import logging
 import pysolr
@@ -829,6 +830,53 @@ def test_related_cache_is_full(self):
         fire_the_iterator_and_fill_cache = [result for result in results]
         self.assertEqual(results._cache_is_full(), True)
         self.assertEqual(len(backends.queries), 5)
+    
+    def test_quotes_regression(self):
+        sqs = self.sqs.auto_query("44°48'40''N 20°28'32''E")
+        # Should not have empty terms.
+        self.assertEqual(sqs.query.build_query(), u"(44\ufffd\ufffd48'40''N AND 20\ufffd\ufffd28'32''E)")
+        # Should not cause Solr to 500.
+        self.assertEqual(sqs.count(), 0)
+        
+        sqs = self.sqs.auto_query('blazing')
+        self.assertEqual(sqs.query.build_query(), u'blazing')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('blazing saddles')
+        self.assertEqual(sqs.query.build_query(), u'(blazing AND saddles)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('"blazing saddles')
+        self.assertEqual(sqs.query.build_query(), u'(\\"blazing AND saddles)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('"blazing saddles"')
+        self.assertEqual(sqs.query.build_query(), u'"blazing saddles"')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing saddles"')
+        self.assertEqual(sqs.query.build_query(), u'("blazing saddles" AND mel)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing \'saddles"')
+        self.assertEqual(sqs.query.build_query(), u'("blazing \'saddles" AND mel)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing \'\'saddles"')
+        self.assertEqual(sqs.query.build_query(), u'("blazing \'\'saddles" AND mel)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing \'\'saddles"\'')
+        self.assertEqual(sqs.query.build_query(), u'("blazing \'\'saddles" AND mel AND \')')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing \'\'saddles"\'"')
+        self.assertEqual(sqs.query.build_query(), u'("blazing \'\'saddles" AND mel AND \'\\")')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('"blazing saddles" mel')
+        self.assertEqual(sqs.query.build_query(), u'("blazing saddles" AND mel)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('"blazing saddles" mel brooks')
+        self.assertEqual(sqs.query.build_query(), u'("blazing saddles" AND mel AND brooks)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing saddles" brooks')
+        self.assertEqual(sqs.query.build_query(), u'("blazing saddles" AND mel AND brooks)')
+        self.assertEqual(sqs.count(), 0)
+        sqs = self.sqs.auto_query('mel "blazing saddles" "brooks')
+        self.assertEqual(sqs.query.build_query(), u'("blazing saddles" AND mel AND \\"brooks)')
+        self.assertEqual(sqs.count(), 0)
 
 
 class LiveSolrMoreLikeThisTestCase(TestCase):

tests/whoosh_tests/tests/whoosh_backend.py

@@ -488,7 +488,7 @@ def test_various_searchquerysets(self):
         self.assertEqual(len(sqs), 0)
 
         sqs = self.sqs.auto_query("daler-rowney pearlescent 'bell bronze'")
-        self.assertEqual(sqs.query.build_query(), u"(\"bell bronze\" AND 'daler-rowney' AND pearlescent)")
+        self.assertEqual(sqs.query.build_query(), u"('daler-rowney' AND pearlescent AND 'bell AND bronze')")
         self.assertEqual(len(sqs), 0)
 
         sqs = self.sqs.models(MockModel)