improve FULLTEXT_BOOLEAN_DETECTOR, i.e. '*a' is not a boolean search, but 'a*' is.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45521 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SearchKey/FullTextKey.py

@@ -36,7 +36,7 @@ from zope.interface.verify import verifyClass
 from Products.ZSQLCatalog.SQLCatalog import profiler_decorator
 import re
 
-FULLTEXT_BOOLEAN_DETECTOR = re.compile(r'.*(^|\s)[\+\-<>\(\)\~\*]')
+FULLTEXT_BOOLEAN_DETECTOR = re.compile(r'.*((^|\s)[\+\-<>\(\~]|[\*\)](\s|$))')
 
 class FullTextKey(SearchKey):
   """

product/ZSQLCatalog/tests/testSQLCatalog.py

@@ -539,11 +539,29 @@ class TestSQLCatalog(unittest.TestCase):
       Fulltext searches must switch automatically to boolean mode if boolean
       operators are found in search value.
     """
+    self.catalog(ReferenceQuery(ReferenceQuery(operator='match_boolean',
+                                fulltext=MatchList(['a*'])), operator='and'),
+                 {'fulltext': 'a*'})
+
+    self.catalog(ReferenceQuery(ReferenceQuery(operator='match_boolean',
+                                fulltext=MatchList(['a* b'])), operator='and'),
+                 {'fulltext': 'a* b'})
+
+    self.catalog(ReferenceQuery(ReferenceQuery(operator='match', fulltext='*a'),
+                                operator='and'),
+                 {'fulltext': '*a'})
+
+    self.catalog(ReferenceQuery(ReferenceQuery(operator='match', fulltext='a'),
+                                operator='and'),
+                 {'fulltext': 'a'})
+
     self.catalog(ReferenceQuery(ReferenceQuery(operator='match', fulltext='a+b'), operator='and'),
                  {'fulltext': 'a+b'})
+
     self.catalog(ReferenceQuery(ReferenceQuery(operator='match_boolean',
       fulltext=MatchList(['a +b', '+b a'])), operator='and'),
                  {'fulltext': 'a +b'}, check_search_text=False)
+
     self.catalog(ReferenceQuery(ReferenceQuery(
         ReferenceQuery(operator='=', uid='foo'),
         ReferenceQuery(operator='match_boolean',