Tests for Link expressions

.. and fixes for anydbm backend, this now passes all the new tests.

Author: schlatterbeck

roundup/backends/back_anydbm.py

@@ -1701,13 +1701,7 @@ def _filter(self, search_matches, filterspec, proptree,
                 if isinstance(propclass, hyperdb.Link):
                     if type(v) is not type([]):
                         v = [v]
-                    u = []
-                    for entry in v:
-                        # the value -1 is a special "not set" sentinel
-                        if entry == '-1':
-                            entry = None
-                        u.append(entry)
-                    l.append((LINK, k, u))
+                    l.append((LINK, k, v))
                 elif isinstance(propclass, hyperdb.Multilink):
                     # If it's a reverse multilink, we've already
                     # computed the ids of our own class.
@@ -1814,7 +1808,9 @@ def _filter(self, search_matches, filterspec, proptree,
                     if t == LINK:
                         # link - if this node's property doesn't appear in the
                         # filterspec's nodeid list, skip it
-                        match = nv in v
+                        expr = Expression(v, is_link=True)
+                        if expr.evaluate(nv):
+                            match = 1
                     elif t == MULTILINK:
                         # multilink - if any of the nodeids required by the
                         # filterspec aren't in this node's property, then skip

roundup/hyperdb.py

@@ -585,7 +585,8 @@ def search(self, search_matches=None, sort=True, retired=False):
         exact_match_spec = {}
         for p in self.children:
             if 'search' in p.need_for:
-                if p.children:
+                x = [c for c in p.children if 'search' in c.need_for]
+                if x:
                     p.search(sort=False)
                 if getattr(p.propclass,'rev_property',None):
                     pn = p.propclass.rev_property.name
@@ -2122,4 +2123,3 @@ def Choice(name, db, *options):
         cl.create(name=options[i], order=i)
     return Link(name)
 
-# vim: set filetype=python sts=4 sw=4 et si :

roundup/mlink_expr.py

@@ -87,16 +87,23 @@ def compile_expression(opcodes):
 
 class Expression:
 
-    def __init__(self, v):
+    def __init__(self, v, is_link=False):
         try:
             opcodes = [int(x) for x in v]
             if min(opcodes) >= -1:
                 raise ValueError()
 
             compiled = compile_expression(opcodes)
-            self.evaluate = lambda x: compiled.evaluate([int(y) for y in x])
+            if is_link:
+                self.evaluate = lambda x: compiled.evaluate(
+                    x and [int(x)] or [])
+            else:
+                self.evaluate = lambda x: compiled.evaluate([int(y) for y in x])
         except:
-            if '-1' in v:
+            if is_link:
+                v = [None if x == '-1' else x for x in v]
+                self.evaluate = lambda x: x in v
+            elif '-1' in v:
                 v = [x for x in v if int(x) > 0]
                 self.evaluate = lambda x: bool(set(x) & set(v)) or not x
             else:

test/db_test_base.py

@@ -1854,13 +1854,36 @@ def testFilteringLink(self):
             ae(filt(None, {'status': '1'}, ('+','id'), grp), ['2','3'])
             ae(filt(None, {'status': [], 'status.name': 'unread'}), [])
             ae(filt(None, {a: '-1'}, ('+','id'), grp), ['3','4'])
-            # Currently works only for non-sql backends:
-            #ae(filt(None, {a: []}, ('+','id'), grp), ['3','4'])
             ae(filt(None, {a: None}, ('+','id'), grp), ['3','4'])
             ae(filt(None, {a: [None]}, ('+','id'), grp), ['3','4'])
             ae(filt(None, {a: ['-1', None]}, ('+','id'), grp), ['3','4'])
             ae(filt(None, {a: ['1', None]}, ('+','id'), grp), ['1', '3','4'])
 
+    @pytest.mark.xfail
+    def testFilteringLinkExpression(self):
+        ae, iiter = self.filteringSetup()
+        a = 'assignedto'
+        for filt in iiter():
+            ae(filt(None, {}, ('+',a)), ['3','4','1','2'])
+            ae(filt(None, {a: '1'}, ('+',a)), ['1'])
+            ae(filt(None, {a: '2'}, ('+',a)), ['2'])
+            ae(filt(None, {a: '-1'}, ('+','status')), ['4','3'])
+            ae(filt(None, {a: []}, ('+','id')), ['3','4'])
+            ae(filt(None, {a: ['-1']}, ('+',a)), ['3','4'])
+            ae(filt(None, {a: []}, ('+',a)), ['3','4'])
+            ae(filt(None, {a: '-1'}, ('+',a)), ['3','4'])
+            ae(filt(None, {a: ['1','-1']}), ['1','3','4'])
+            ae(filt(None, {a: ['1','-1']}, ('+',a)), ['3','4','1'])
+            ae(filt(None, {a: ['2','-1']}, ('+',a)), ['3','4','2'])
+            ae(filt(None, {a: ['1','-2']}), ['2','3','4'])
+            ae(filt(None, {a: ['1','-2']}, ('+',a)), ['3','4','2'])
+            ae(filt(None, {a: ['-1','-2']}, ('+',a)), ['1','2'])
+            ae(filt(None, {a: ['1','2','-3']}, ('+',a)), [])
+            ae(filt(None, {a: ['1','2','-4']}, ('+',a)), ['1','2'])
+            ae(filt(None, {a: ['1','-2','2','-2','-3']}, ('+',a)), ['3','4'])
+            ae(filt(None, {a: ['1','-2','2','-2','-4']}, ('+',a)),
+                ['3','4','1','2'])
+
     def testFilteringRevLink(self):
         ae, iiter = self.filteringSetupTransitiveSearch('user')
         # We have