fix invalid sql produced for multilink condition with empty value list;

trim trailing spaces

Author: Alexander Smishlajev

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.116 2004-07-02 05:22:09 richard Exp $
+# $Id: rdbms_common.py,v 1.117 2004-07-02 08:15:01 a1s Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -476,7 +476,7 @@ def drop_class_table_key_index(self, cn, key):
         self.sql(sql)
 
     def create_journal_table(self, spec):
-        ''' create the journal table for a class given the spec and 
+        ''' create the journal table for a class given the spec and
             already-determined cols
         '''
         # journal table
@@ -981,7 +981,7 @@ def addjournal(self, classname, nodeid, action, params, creator=None,
         if __debug__:
             self.config.logging.getLogger('hyperdb').debug('addjournal %s%s %r %s %s %r'%(classname,
                 nodeid, journaldate, journaltag, action, params))
-    
+
         # make the journalled data marshallable
         if isinstance(params, type({})):
             self._journal_marshal(params, classname)
@@ -1009,7 +1009,7 @@ def setjournal(self, classname, nodeid, journal):
                 self.config.logging.getLogger('hyperdb').debug('addjournal %s%s %r %s %s %r'%(
                     classname, nodeid, journaldate, journaltag, action,
                     params))
-        
+
             # make the journalled data marshallable
             if isinstance(params, type({})):
                 self._journal_marshal(params, classname)
@@ -1168,7 +1168,7 @@ def close(self):
 #
 class Class(hyperdb.Class):
     ''' The handle to a particular class of nodes in a hyperdatabase.
-        
+
         All methods except __repr__ and getnode must be implemented by a
         concrete backend Class.
     '''
@@ -1223,21 +1223,21 @@ def create(self, **propvalues):
 
         The values of arguments must be acceptable for the types of their
         corresponding properties or a TypeError is raised.
-        
+
         If this class has a key property, it must be present and its value
         must not collide with other key strings or a ValueError is raised.
-        
+
         Any other properties on this class that are missing from the
         'propvalues' dictionary are set to None.
-        
+
         If an id in a link or multilink property does not refer to a valid
         node, an IndexError is raised.
         '''
         self.fireAuditors('create', None, propvalues)
         newid = self.create_inner(**propvalues)
         self.fireReactors('create', newid, None)
         return newid
-    
+
     def create_inner(self, **propvalues):
         ''' Called by create, in-between the audit and react calls.
         '''
@@ -1432,7 +1432,7 @@ def get(self, nodeid, propname, default=_marker, cache=1):
 
     def set(self, nodeid, **propvalues):
         '''Modify a property on an existing node of this class.
-        
+
         'nodeid' must be the id of an existing node of this class or an
         IndexError is raised.
 
@@ -1452,11 +1452,11 @@ class or a KeyError is raised.
         oldvalues = copy.deepcopy(self.db.getnode(self.classname, nodeid))
         propvalues = self.set_inner(nodeid, **propvalues)
         self.fireReactors('set', nodeid, oldvalues)
-        return propvalues        
+        return propvalues
 
     def set_inner(self, nodeid, **propvalues):
         ''' Called by set, in-between the audit and react calls.
-        ''' 
+        '''
         if not propvalues:
             return propvalues
 
@@ -1651,10 +1651,10 @@ def set_inner(self, nodeid, **propvalues):
 
     def retire(self, nodeid):
         '''Retire a node.
-        
+
         The properties on the node remain available from the get() method,
         and the node's id is never reused.
-        
+
         Retired nodes are not returned by the find(), list(), or lookup()
         methods, and other nodes may reuse the values of their key properties.
         '''
@@ -1702,7 +1702,7 @@ def restore(self, nodeid):
             self.db.addjournal(self.classname, nodeid, 'restored', None)
 
         self.fireReactors('restore', nodeid, None)
-        
+
     def is_retired(self, nodeid):
         '''Return true if the node is rerired
         '''
@@ -1713,7 +1713,7 @@ def is_retired(self, nodeid):
 
     def destroy(self, nodeid):
         '''Destroy a node.
-        
+
         WARNING: this method should never be used except in extremely rare
                  situations where there could never be links to the node being
                  deleted
@@ -1918,7 +1918,7 @@ def stringFind(self, **requirements):
         properties in a caseless search.
 
         If the property is not a String property, a TypeError is raised.
-        
+
         The return is a list of the id of all nodes that match.
         '''
         where = []
@@ -1948,7 +1948,7 @@ def list(self):
     def getnodeids(self, retired=None):
         ''' Retrieve all the ids of the nodes for a particular Class.
 
-            Set retired=None to get all nodes. Otherwise it'll get all the 
+            Set retired=None to get all nodes. Otherwise it'll get all the
             retired or non-retired nodes, depending on the flag.
         '''
         # flip the sense of the 'retired' flag if we don't want all of them
@@ -2060,7 +2060,8 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                         s = ','.join([a for x in v])
                         where.append('(_%s._%s in (%s))'%(cn, k, s))
                         args = args + v
-                    where.append(' or '.join(l))
+                    if l:
+                        where.append(' or '.join(l))
                 else:
                     if v in ('-1', None):
                         v = None
@@ -2086,7 +2087,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                             args.append(dc(date_rng.to_value))
                     except ValueError:
                         # If range creation fails - ignore that search parameter
-                        pass                        
+                        pass
             elif isinstance(propclass, Interval):
                 # filter using the __<prop>_int__ column
                 if isinstance(v, type([])):
@@ -2105,7 +2106,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                             args.append(date_rng.to_value.as_seconds())
                     except ValueError:
                         # If range creation fails - ignore that search parameter
-                        pass                        
+                        pass
             else:
                 if isinstance(v, type([])):
                     s = ','.join([a for x in v])
@@ -2384,7 +2385,7 @@ def import_list(self, propnames, proplist):
         if not self.hasnode(newid):
             self.db.addnode(self.classname, newid, d) # insert
         else:
-            self.db.setnode(self.classname, newid, d) # update 
+            self.db.setnode(self.classname, newid, d) # update
 
         # retire?
         if retire:
@@ -2427,7 +2428,7 @@ def export_journals(self):
 
     def import_journals(self, entries):
         '''Import a class's journal.
-        
+
         Uses setjournal() to set the journal for each item.'''
         properties = self.getprops()
         d = {}