Journal and database testing.

- Add to Import/Export test to also test that journals are correctly
  retrieved
- Fix a bug in anydbm backend that didn't export journal 'set' actions
  where the previous value was None -- all other backends export them
  correctly so I consider this a bug of anydbm
- Fix journal import/export of Date and Interval for metakit
- Fix journal import of Password for metakit
- Fix setting of Password oldvalue for metakit -- this would be written
  as the string "None" instead of the value None. Note that existing
  databases *will* have wrong log-entries. Since this is only for
  passwords -- and old passwords aren't of much importance -- I consider
  this fix to be enough... This fix makes the Journal import/export test
  run for metakit.

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -7,6 +7,8 @@ Feature:
   still limited to 1970-2038.
 Fixed:
 - Handling of unset Link search in RDBMS backend
+- Journal import/export for metakit backend
+- Journal export of anydbm didn't correctly export previously empty values
 
 
 2007-02-15 1.3.3

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.202 2006-08-29 04:20:50 richard Exp $
+#$Id: back_anydbm.py,v 1.203 2007-03-14 15:23:11 schlatterbeck Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1962,8 +1962,7 @@ def export_journals(self):
                         prop = properties[propname]
                         # make sure the params are eval()'able
                         if value is None:
-                            # don't export empties
-                            continue
+                            pass
                         elif isinstance(prop, hyperdb.Date):
                             # this is a hack - some dates are stored as strings
                             if not isinstance(value, type('')):

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.113 2006-08-29 04:20:50 richard Exp $
+# $Id: back_metakit.py,v 1.114 2007-03-14 15:23:11 schlatterbeck Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -735,7 +735,10 @@ def set_inner(self, nodeid, **propvalues):
                 if value is None:
                     value = ''
                 setattr(row, key, str(value))
-                changes[key] = str(oldvalue)
+                if oldvalue is None:
+                    changes[key] = oldvalue
+                else:
+                    changes[key] = str(oldvalue)
                 propvalues[key] = str(value)
 
             elif isinstance(prop, hyperdb.Date):
@@ -1668,8 +1671,8 @@ def export_journals(self):
         properties = self.getprops()
         r = []
         for nodeid in self.getnodeids():
-            for nodeid, date, user, action, params in self.history(nodeid):
-                date = date.get_tuple()
+            for nodeid, dt, user, action, params in self.history(nodeid):
+                dt = dt.get_tuple()
                 if action == 'set':
                     export_data = {}
                     for propname, value in params.items():
@@ -1682,14 +1685,18 @@ def export_journals(self):
                         if value is None:
                             pass
                         elif isinstance(prop, Date):
+                            if isinstance(value, str):
+                                value = date.Date(value)
                             value = value.get_tuple()
                         elif isinstance(prop, Interval):
+                            if isinstance(value, str):
+                                value = date.Interval(value)
                             value = value.get_tuple()
                         elif isinstance(prop, Password):
                             value = str(value)
                         export_data[propname] = value
                     params = export_data
-                l = [nodeid, date, user, action, params]
+                l = [nodeid, dt, user, action, params]
                 r.append(map(repr, l))
         return r
 
@@ -1710,13 +1717,13 @@ def import_journals(self, entries):
                     if value is None:
                         pass
                     elif isinstance(prop, hyperdb.Date):
-                        value = date.Date(value)
+                        value = str(date.Date(value))
                     elif isinstance(prop, hyperdb.Interval):
-                        value = date.Interval(value)
+                        value = str (date.Interval(value))
                     elif isinstance(prop, hyperdb.Password):
                         pwd = password.Password()
                         pwd.unpack(value)
-                        value = pwd
+                        value = str(pwd)
                     params[propname] = value
             action = _names_to_actionnames[action]
             r.append((nodeid, jdate, user, action, params))

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.83 2007-03-09 10:25:10 schlatterbeck Exp $
+# $Id: db_test_base.py,v 1.84 2007-03-14 15:23:11 schlatterbeck Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -1484,15 +1484,33 @@ def testFilteringSortId(self):
     def testImportExport(self):
         # use the filtering setup to create a bunch of items
         ae, filt = self.filteringSetup()
+        # Get some stuff into the journal for testing import/export of
+        # journal data:
+        self.db.user.set('4', password = password.Password('xyzzy'))
+        self.db.user.set('4', age = 3)
+        self.db.user.set('4', assignable = True)
+        self.db.issue.set('1', title = 'i1', status = '3')
+        self.db.issue.set('1', deadline = date.Date('2007'))
+        self.db.issue.set('1', foo = date.Interval('1:20'))
+        p = self.db.priority.create(name = 'some_prio_without_order')
+        self.db.commit()
+        self.db.user.set('4', password = password.Password('123xyzzy'))
+        self.db.user.set('4', assignable = False)
+        self.db.priority.set(p, order = '4711')
+        self.db.commit()
+
         self.db.user.retire('3')
         self.db.issue.retire('2')
 
         # grab snapshot of the current database
         orig = {}
+        origj = {}
         for cn,klass in self.db.classes.items():
             cl = orig[cn] = {}
+            jn = origj[cn] = {}
             for id in klass.list():
                 it = cl[id] = {}
+                jn[id] = self.db.getjournal(cn, id)
                 for name in klass.getprops().keys():
                     it[name] = klass.get(id, name)
 
@@ -1531,11 +1549,13 @@ def testImportExport(self):
                     maxid = max(maxid, id)
                 self.db.setid(cn, str(maxid+1))
                 klass.import_journals(journals[cn])
+            # This is needed, otherwise journals won't be there for anydbm
+            self.db.commit()
         finally:
             shutil.rmtree('_test_export')
 
         # compare with snapshot of the database
-        for cn, items in orig.items():
+        for cn, items in orig.iteritems():
             klass = self.db.classes[cn]
             propdefs = klass.getprops(1)
             # ensure retired items are retired :)
@@ -1555,6 +1575,19 @@ def testImportExport(self):
                             raise
                         # don't get hung up on rounding errors
                         assert not l.__cmp__(value, int_seconds=1)
+        for jc, items in origj.iteritems():
+            for id, oj in items.iteritems():
+                rj = self.db.getjournal(jc, id)
+                # Both mysql and postgresql have some minor issues with
+                # rounded seconds on export/import, so we compare only
+                # the integer part.
+                for j in oj:
+                    j[1].second = float(int(j[1].second))
+                for j in rj:
+                    j[1].second = float(int(j[1].second))
+                oj.sort()
+                rj.sort()
+                ae(oj, rj)
 
         # make sure the retired items are actually imported
         ae(self.db.user.get('4', 'username'), 'blop')