- unify bool searching (filter method) across backends

Author: Ralf Schlatterbeck

roundup/backends/back_anydbm.py

@@ -1630,12 +1630,14 @@ def _filter(self, search_matches, filterspec, proptree,
                     pass
 
             elif isinstance(propclass, hyperdb.Boolean):
-                if type(v) != type([]):
+                if type(v) == type(""):
                     v = v.split(',')
+                if type(v) != type([]):
+                    v = [v]
                 bv = []
                 for val in v:
                     if type(val) is type(''):
-                        bv.append(val.lower() in ('yes', 'true', 'on', '1'))
+                        bv.append(propclass.from_raw (val))
                     else:
                         bv.append(val)
                 l.append((OTHER, k, bv))

roundup/backends/rdbms_common.py

@@ -2330,6 +2330,24 @@ def filter(self, search_matches, filterspec, sort=[], group=[]):
                             pass
                 if p.sort_type > 0:
                     oc = ac = '_%s.__%s_int__'%(pln,k)
+            elif isinstance(propclass, Boolean) and p.sort_type < 2:
+                if type(v) == type(""):
+                    v = v.split(',')
+                if type(v) != type([]):
+                    v = [v]
+                bv = []
+                for val in v:
+                    if type(val) is type(''):
+                        bv.append(propclass.from_raw (val))
+                    else:
+                        bv.append(bool(val))
+                if len(bv) == 1:
+                    where.append('_%s._%s=%s'%(pln, k, a))
+                    args = args + bv
+                else:
+                    s = ','.join([a for x in v])
+                    where.append('_%s._%s in (%s)'%(pln, k, s))
+                    args = args + bv
             elif p.sort_type < 2:
                 if isinstance(v, type([])):
                     s = ','.join([a for x in v])

test/db_test_base.py

@@ -1086,9 +1086,9 @@ def testStringFind(self):
 
     def filteringSetup(self):
         for user in (
-                {'username': 'bleep', 'age': 1},
-                {'username': 'blop', 'age': 1.5},
-                {'username': 'blorp', 'age': 2}):
+                {'username': 'bleep', 'age': 1, 'assignable': True},
+                {'username': 'blop', 'age': 1.5, 'assignable': True},
+                {'username': 'blorp', 'age': 2, 'assignable': False}):
             self.db.user.create(**user)
         iss = self.db.issue
         file_content = ''.join([chr(i) for i in range(255)])
@@ -1116,6 +1116,33 @@ def testFilteringID(self):
         ae(filt(None, {'id': '2'}, ('+','id'), (None,None)), ['2'])
         ae(filt(None, {'id': '100'}, ('+','id'), (None,None)), [])
 
+    def testFilteringBoolean(self):
+        self.filteringSetup()
+        ae, filt = self.assertEqual, self.db.user.filter
+        a = 'assignable'
+        ae(filt(None, {a: '1'}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: '0'}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: ['1']}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: ['0']}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: ['0','1']}, ('+','id'), (None,None)), ['3','4','5'])
+        ae(filt(None, {a: 'True'}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: 'False'}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: ['True']}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: ['False']}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: ['False','True']}, ('+','id'), (None,None)),
+            ['3','4','5'])
+        ae(filt(None, {a: True}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: False}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: 1}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: 0}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: [1]}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: [0]}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: [0,1]}, ('+','id'), (None,None)), ['3','4','5'])
+        ae(filt(None, {a: [True]}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {a: [False]}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {a: [False,True]}, ('+','id'), (None,None)),
+            ['3','4','5'])
+
     def testFilteringNumber(self):
         self.filteringSetup()
         ae, filt = self.assertEqual, self.db.user.filter