not operator should process empty lists

zopefoundation · Mar 21, 2018 · 5662260 · 5662260 · sgeulette · Apr 18, 2018
1 parent 2a21568
commit 5662260
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/Products/PluginIndexes/DateIndex/tests.py b/src/Products/PluginIndexes/DateIndex/tests.py
@@ -305,6 +305,7 @@ def test_not(self):
                                  {'not': [DateTime(0),
                                           DateTime('2002-05-08 15:16:17')]}},
                          values[3:])
+        self._checkApply(index, {'date': {'not': []}}, values[0:])
 
     def test_naive_convert_to_utc(self):
         index = self._makeOne()

diff --git a/src/Products/PluginIndexes/FieldIndex/tests.py b/src/Products/PluginIndexes/FieldIndex/tests.py
@@ -101,6 +101,7 @@ def setUp(self):
         self._not_4 = {'foo': {'not': ['0']}}
         self._not_5 = {'foo': {'not': ['a', 'b']}}
         self._not_6 = {'foo': 'a', 'bar': {'query': 123, 'not': 1}}
+        self._not_7 = {'foo': {'not': []}}
 
     def _populateIndex(self):
         for k, v in self._values:
@@ -209,6 +210,7 @@ def testPopulated(self):
         self._checkApply(self._not_4, values[:7])
         self._checkApply(self._not_5, values[1:])
         self._checkApply(self._not_6, values[0:1])
+        self._checkApply(self._not_7, values[:7])
 
     def testNone(self):
         # Make sure None is ignored.

diff --git a/src/Products/PluginIndexes/KeywordIndex/tests.py b/src/Products/PluginIndexes/KeywordIndex/tests.py
@@ -81,6 +81,7 @@ def setUp(self):
         self._not_4 = {'foo': {'not': ['0', 'e']}}
         self._not_5 = {'foo': {'not': ['0', 'no-value']}}
         self._not_6 = {'foo': 'c', 'bar': {'query': 123, 'not': 1}}
+        self._not_7 = {'foo': {'not': []}}
 
     def _populateIndex(self):
         for k, v in self._values:
@@ -184,6 +185,7 @@ def testPopulated(self):
         self._checkApply(self._not_4, values[:5])
         self._checkApply(self._not_5, values[:7])
         self._checkApply(self._not_6, values[2:7])
+        self._checkApply(self._not_7, values[:7])
 
     def testReindexChange(self):
         self._populateIndex()

diff --git a/src/Products/PluginIndexes/unindex.py b/src/Products/PluginIndexes/unindex.py
@@ -452,14 +452,14 @@ def query_index(self, record, resultset=None):
                     if isinstance(cached, int):
                         cached = IISet((cached, ))
 
-                    if not_parm:
+                    if not_parm is not None:
                         not_parm = list(map(self._convert, not_parm))
                         exclude = self._apply_not(not_parm, resultset)
                         cached = difference(cached, exclude)
 
                     return cached
 
-        if not record.keys and not_parm:
+        if not record.keys and not_parm is not None:
             # convert into indexed format
             not_parm = list(map(self._convert, not_parm))
             # we have only a 'not' query
@@ -509,7 +509,7 @@ def query_index(self, record, resultset=None):
                     else:
                         cache[cachekey] = [result]
 
-                if not_parm:
+                if not_parm is not None:
                     exclude = self._apply_not(not_parm, resultset)
                     result = difference(result, exclude)
                 return result
@@ -587,7 +587,7 @@ def query_index(self, record, resultset=None):
                     else:
                         cache[cachekey] = [result]
 
-                if not_parm:
+                if not_parm is not None:
                     exclude = self._apply_not(not_parm, resultset)
                     result = difference(result, exclude)
                 return result
@@ -634,7 +634,7 @@ def query_index(self, record, resultset=None):
             r = IISet((r, ))
         if r is None:
             return IISet()
-        if not_parm:
+        if not_parm is not None:
             exclude = self._apply_not(not_parm, resultset)
             r = difference(r, exclude)
         return r