merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -8,6 +8,8 @@ Fixed:
 - allow list of values for id, Number and Boolean filtering in anydbm
   backend
 - fixed some more mysql 0.6->0.7 upgrade bugs (sf bug 950410)
+- fixed Boolean values in postgresql (sf bugs 972546 and 972600)
+- fixed -g arg to roundup-server (sf bug 973946)
 
 
 2004-06-10 0.7.4

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.8 2004-06-09 09:48:49 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.9 2004-06-21 04:34:57 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -53,6 +53,12 @@ def _num_cvt(num):
     except:
         return float(num)
 
+def _bool_cvt(value):
+    if value in ('TRUE', 'FALSE'):
+        return {'TRUE': 1, 'FALSE': 0}[value]
+    # assume it's a number returned from the db API
+    return int(value)
+
 class Database(FileStorage, hyperdb.Database, roundupdb.Database):
     ''' Wrapper around an SQL database that presents a hyperdb interface.
 
@@ -736,7 +742,7 @@ def addnode(self, classname, nodeid, node):
 
             prop = props[col[1:]]
             value = values[col[1:]]
-            if value:
+            if value is not None:
                 value = self.hyperdb_to_sql_value[prop.__class__](value)
             vals.append(value)
         vals.append(nodeid)
@@ -876,7 +882,7 @@ def setnode(self, classname, nodeid, values, multilink_changes={}):
         hyperdb.Link   : str,
         hyperdb.Interval  : date.Interval,
         hyperdb.Password  : lambda x: password.Password(encrypted=x),
-        hyperdb.Boolean   : int,
+        hyperdb.Boolean   : _bool_cvt,
         hyperdb.Number    : _num_cvt,
         hyperdb.Multilink : lambda x: x,    # used in journal marshalling
     }

roundup/scripts/roundup_server.py

@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.46.2.2 2004-05-12 22:31:37 richard Exp $
+$Id: roundup_server.py,v 1.46.2.3 2004-06-21 04:34:58 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -477,19 +477,19 @@ def run(port=PORT, success_message=None):
                       _("Unable to bind to port %s, port already in use." % port)
             raise
 
-        if group is not None and hasattr(os, 'getgid'):
+        if group is not None and hasattr(os, 'getuid'):
             # if root, setgid to the running user
-            if not os.getgid() and user is not None:
+            if not os.getuid():
                 try:
-                    import pwd
+                    import grp
                 except ImportError:
-                    raise ValueError, _("Can't change groups - no pwd module")
+                    raise ValueError, _("Can't change groups - no grp module")
                 try:
-                    gid = pwd.getpwnam(user)[3]
+                    gid = grp.getgrnam(group)[2]
                 except KeyError:
                     raise ValueError,_("Group %(group)s doesn't exist")%locals()
                 os.setgid(gid)
-            elif os.getgid() and user is not None:
+            elif os.getuid():
                 print _('WARNING: ignoring "-g" argument, not root')
 
         if hasattr(os, 'getuid'):

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.4 2004-06-13 01:08:06 richard Exp $ 
+# $Id: db_test_base.py,v 1.27.2.5 2004-06-21 04:34:58 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -263,11 +263,19 @@ def testIntervalUnset(self):
             self.assertEqual(self.db.issue.get(nid, "foo"), None)
 
     # Boolean
+    def testBooleanSet(self):
+        nid = self.db.user.create(username='one', assignable=1)
+        self.assertEqual(self.db.user.get(nid, "assignable"), 1)
+        nid = self.db.user.create(username='two', assignable=0)
+        self.assertEqual(self.db.user.get(nid, "assignable"), 0)
+
     def testBooleanChange(self):
         userid = self.db.user.create(username='foo', assignable=1)
         self.assertEqual(1, self.db.user.get(userid, 'assignable'))
         self.db.user.set(userid, assignable=0)
         self.assertEqual(self.db.user.get(userid, 'assignable'), 0)
+        self.db.user.set(userid, assignable=1)
+        self.assertEqual(self.db.user.get(userid, 'assignable'), 1)
 
     def testBooleanUnset(self):
         nid = self.db.user.create(username='foo', assignable=1)