merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ Fixed:
 - include "context" always, as documented (sf bug 965447)
 - fixed REMOTE_USER (external HTTP Basic auth) (sf bug 977309)
 - fixed roundup-admin "find" to use better value parsing
+- fixed RDBMS Class.find() to handle None value in multiple find
 
 
 2004-06-10 0.7.4

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.9 2004-06-21 04:34:57 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.10 2004-06-23 23:21:32 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1945,8 +1945,14 @@ def find(self, **propspec):
             elif values is None:
                 where.append('_%s is NULL'%prop)
             else:
-                allvalues += tuple(values.keys())
-                where.append('_%s in (%s)'%(prop, ','.join([a]*len(values))))
+                values = values.keys()
+                s = ''
+                if None in values:
+                    values.remove(None)
+                    s = '_%s is NULL or '%prop
+                allvalues += tuple(values)
+                s += '_%s in (%s)'%(prop, ','.join([a]*len(values)))
+                where.append(s)
         tables = ['_%s'%self.classname]
         if where:
             o.append('(' + ' and '.join(where) + ')')

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.27.2.5 2004-06-21 04:34:58 richard Exp $ 
+# $Id: db_test_base.py,v 1.27.2.6 2004-06-23 23:21:32 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -757,6 +757,13 @@ def testFindLinkUnset(self):
         got.sort()
         self.assertEqual(got, [one, three])
 
+    def testFindMultipleLink(self):
+        one, two, three, four = self._find_test_setup()
+        self.assertEqual(self.db.issue.find(status={'1':1, '3':1}),
+            [one, three, four])
+        self.assertEqual(self.db.issue.find(assignedto={None:1, '1':1}),
+            [one, three, four])
+
     def testFindMultilink(self):
         one, two, three, four = self._find_test_setup()
         got = self.db.issue.find(nosy='2')