Of course for Links there is the same bug as I fixed before for multilinks.

But it turns out that searching for None is valid for a link. So we
can't use None as a guard in support.Proptree, I introduced the
has_values flag there and use it in the sql search too.

Author: Ralf Schlatterbeck

roundup/backends/rdbms_common.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: rdbms_common.py,v 1.173 2006-07-13 10:14:56 schlatterbeck Exp $
+#$Id: rdbms_common.py,v 1.174 2006-07-13 13:30:39 schlatterbeck Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2069,11 +2069,8 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             k = p.name
             v = p.val
             propclass = p.prcls
-            if p.children and not isinstance(propclass, Multilink):
-                if not isinstance(propclass, Link):
-                    raise ValueError,"%s must be Link/Multilink property"%k
-                frum.append('_%s as _%s' % (cn, ln))
-                where.append('_%s._%s=_%s.id'%(pln, k, ln))
+            if p.children and not isinstance(propclass, (Link, Multilink)):
+                raise ValueError,"%s must be Link/Multilink property"%k
             # now do other where clause stuff
             elif isinstance(propclass, Multilink):
                 mlfilt = 1
@@ -2088,7 +2085,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     if p.children:
                         frum.append('_%s as _%s' % (cn, ln))
                         where.append('%s.linkid=_%s.id'%(tn, ln))
-                    if v:
+                    if p.has_values:
                         if isinstance(v, type([])):
                             s = ','.join([a for x in v])
                             where.append('%s.linkid in (%s)'%(tn, s))
@@ -2119,30 +2116,34 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     +')')
                 # note: args are embedded in the query string now
             elif isinstance(propclass, Link):
-                if isinstance(v, type([])):
-                    d = {}
-                    for entry in v:
-                        if entry == '-1':
-                            entry = None
-                        d[entry] = entry
-                    l = []
-                    if d.has_key(None) or not d:
-                        del d[None]
-                        l.append('_%s._%s is NULL'%(pln, k))
-                    if d:
-                        v = d.keys()
-                        s = ','.join([a for x in v])
-                        l.append('(_%s._%s in (%s))'%(pln, k, s))
-                        args = args + v
-                    if l:
-                        where.append('(' + ' or '.join(l) +')')
-                else:
-                    if v in ('-1', None):
-                        v = None
-                        where.append('_%s._%s is NULL'%(pln, k))
+                if p.children:
+                    frum.append('_%s as _%s' % (cn, ln))
+                    where.append('_%s._%s=_%s.id'%(pln, k, ln))
+                if p.has_values:
+                    if isinstance(v, type([])):
+                        d = {}
+                        for entry in v:
+                            if entry == '-1':
+                                entry = None
+                            d[entry] = entry
+                        l = []
+                        if d.has_key(None) or not d:
+                            del d[None]
+                            l.append('_%s._%s is NULL'%(pln, k))
+                        if d:
+                            v = d.keys()
+                            s = ','.join([a for x in v])
+                            l.append('(_%s._%s in (%s))'%(pln, k, s))
+                            args = args + v
+                        if l:
+                            where.append('(' + ' or '.join(l) +')')
                     else:
-                        where.append('_%s._%s=%s'%(pln, k, a))
-                        args.append(v)
+                        if v in ('-1', None):
+                            v = None
+                            where.append('_%s._%s is NULL'%(pln, k))
+                        else:
+                            where.append('_%s._%s=%s'%(pln, k, a))
+                            args.append(v)
             elif isinstance(propclass, Date):
                 dc = self.db.hyperdb_to_sql_value[hyperdb.Date]
                 if isinstance(v, type([])):

roundup/support.py

@@ -125,12 +125,13 @@ class Proptree(object):
     ''' Simple tree data structure for optimizing searching of properties
     '''
 
-    def __init__(self, db, cls, name, props, parent = None, val = None):
+    def __init__(self, db, cls, name, props, parent = None):
         self.db = db
         self.name = name
         self.props = props
         self.parent = parent
-        self._val = val
+        self._val = None
+        self.has_values = False
         self.cls = cls
         self.classname = None
         self.uniqname = None
@@ -171,7 +172,7 @@ def _set_val(self, val):
         """Check if self._val is already defined. If yes, we compute the
         intersection of the old and the new value(s)
         """
-        if self._val:
+        if self.has_values:
             v = self._val
             if not isinstance(self._val, type([])):
                 v = [self._val]
@@ -180,6 +181,7 @@ def _set_val(self, val):
             self._val = [v for v in vals]
         else:
             self._val = val
+        self.has_values = True
 
     val = property(lambda self: self._val, _set_val)
 

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.71 2006-07-13 10:14:56 schlatterbeck Exp $
+# $Id: db_test_base.py,v 1.72 2006-07-13 13:30:39 schlatterbeck Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -977,6 +977,8 @@ def testFilteringLink(self):
         ae(filt(None, {'status': '1'}, ('+','id'), (None,None)), ['2','3'])
         ae(filt(None, {'assignedto': '-1'}, ('+','id'), (None,None)), ['3','4'])
         ae(filt(None, {'assignedto': None}, ('+','id'), (None,None)), ['3','4'])
+        ae(filt(None, {'assignedto': [None]}, ('+','id'), (None,None)),
+            ['3','4'])
         ae(filt(None, {'assignedto': ['-1', None]}, ('+','id'), (None,None)),
             ['3','4'])
         ae(filt(None, {'assignedto': ['1', None]}, ('+','id'), (None,None)),
@@ -1148,6 +1150,8 @@ def testFilteringTransitiveLinkUser(self):
         ae(ufilt(None, {'supervisor.username': 'grouplead2',
             'supervisor.supervisor.username': 'ceo'}, ('+','username')),
             ['8', '9', '10'])
+        ae(ufilt(None, {'supervisor.supervisor': '3', 'supervisor': '4'},
+            ('+','username')), ['6', '7'])
 
     def testFilteringTransitiveLinkIssue(self):
         ae, filt = self.filteringSetupTransitiveSearch()