escape '_' in like expression, that means '.' in regexp.

product/ERP5/Document/SimulationMovement.py

@@ -716,7 +716,7 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin):
     catalog_simulation_movement_list = portal_catalog(
       portal_type='Simulation Movement',
       causality_uid=[p.getUid() for p in remaining_path_set],
-      path='%s/%%' % self.getPath())
+      path='%s/%%' % self.getPath().replace('_', r'\_'))
 
     for movement in catalog_simulation_movement_list:
       path = movement.getCausalityValue()

product/ERP5/ExplanationCache.py

@@ -137,7 +137,7 @@ class ExplanationCache:
         if not isinstance(value, dict):
           # We have a real root
           result.append('%s/%s' % (prefix, key))
-          result.append('%s/%s/%%' % (prefix, key))
+          result.append(('%s/%s/%%' % (prefix, key)).replace('_', r'\_'))
           # XXX-JPS here we must add all parent movements XXX-JPS
         else:
           browsePathDict('%s/%s' % (prefix, key), value) # Recursing with string append is slow XXX-JPS
@@ -262,7 +262,7 @@ class ExplanationCache:
         if simulation_path.startswith(path):
           # Only keep a path pattern which matches current simulation movement
           path_set.add(path)
-          path_set.add("%s/%%" % path)
+          path_set.add("%s/%%" % path.replace('_', r'\_'))
 
     # Lookup in cache based on path_tuple
     path_tuple = tuple(path_set) # XXX-JPS is the order guaranteed here ?

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getRelatedDocumentList.xml

@@ -58,7 +58,7 @@ follow_up_related_document_list = portal_catalog(\n
            portal_type=portal_type,\n
            follow_up_uid=context.getUid(), **kw)\n
 \n
-kw[\'query\'] = Query(relative_url=\'%s/%%\' % context.getRelativeUrl())\n
+kw[\'query\'] = Query(relative_url=\'%s/%%\' % context.getRelativeUrl().replace(\'_\', r\'\\_\'))\n
 if follow_up_related_document_list:\n
   kw[\'query\'] = ComplexQuery(\n
     kw[\'query\'],\n

product/ERP5/bootstrap/erp5_core/bt/revision

-41041
+41042
\ No newline at end of file

[Julien Muchembled]

@seb has just pointed out that for consistency, the escaping should be done directly inside ZSQLCatalog, since DefaultKey only switches to LIKE on a % char, and I doubt we want to change DefaultKey to also switch on _.

/cc @vpelletier

[Vincent Pelletier]

I indeed doubt we want to trigger MATCH on underscores (which is unfortunate IMHO, it should have happened from day 1, but it's harder to change since then).

About escaping it, where do you propose it to happen ? DefaultKey only ? I know I used underscore as a wildcard in the past, although not often, and I do not clearly remember using it in any script (rather in listbox filters).

/cc @seb @jm