Products.ERP5Type.Core.Predicate: Obey isEmptyCriterionValid .

When EmptyCriterionValid property is true, this method is expected to
return a query which does not match any document. This only happens when
query_list is empty, but because of category membership checking,
query_list is never empty: it at least contains two ComplexQueries which
themselves may contain an empty query list, and which match all documents.
Calling getCategoryParameterDict with an empty list is dubious, but
changing its behaviour in ZSQLCatalog may affect more than just predicates,
so change the behaviour in Predicate class directly by checking whether
there is any category being matched to begin with.

product/ERP5Type/Core/Predicate.py

@@ -246,13 +246,18 @@ class Predicate(XMLObject):
         self.getMembershipCriterionCategoryList,
       ),
     ):
-      append(
-        getCategoryParameterDict(
-          filterCategoryList(getBaseCategorySet(), getCategoryList()),
-          strict_membership=strict_membership,
-          onMissing=lambda category: False,
-        ),
+      filtered_category_list = filterCategoryList(
+        getBaseCategorySet(),
+        getCategoryList(),
       )
+      if filtered_category_list:
+        append(
+          getCategoryParameterDict(
+            filtered_category_list,
+            strict_membership=strict_membership,
+            onMissing=lambda category: False,
+          ),
+        )
 
     # Value criterion
     for criterion in self.getCriterionList():