Fix and add a test for the case where the date is an empty string - and...

Fix and add a test for the case where the date is an empty string - and therefore should be ignored in the final query.


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

product/ERP5Catalog/tests/testERP5Catalog.py

@@ -1746,7 +1746,13 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
     self.failIfDifferentSet([org_a.getPath()],
         [x.path for x in self.getCatalogTool()(
                 portal_type='Organisation',**catalog_kw)])
-
+    # If the date is an empty string, check that all objects are displayed.
+    catalog_kw = {'modification_date':{'query':'',
+                               'format':'%d/%m/%Y',
+                               'type':'date'}}
+    self.failIfDifferentSet([org_a.getPath(), org_b.getPath()],
+        [x.path for x in self.getCatalogTool()(
+                portal_type='Organisation',**catalog_kw)])
 
 if __name__ == '__main__':
     framework()

product/ZSQLCatalog/SQLCatalog.py

@@ -377,7 +377,7 @@ class Query(QueryMixin):
                      (key, value, mode,key.split('.')[1]))
           else:
             comparison_operator = '='
-        else:
+        elif not isinstance(value, basestring):
           comparison_operator = '='
         if comparison_operator is not None:
           key = self._quoteSQLKey(key)