Fixed retirement of items in rdbms imports [SF#841355]

Fixed bug in looking up journal of newly-created items in *dbm backends

Author: Richard Jones

CHANGES.txt

@@ -61,6 +61,8 @@ Fixed:
   Date +/- Interval now works, and Date - Date also works (produces
   an Interval.
 - Handle socket timeout exception (thanks Marcus Priesch)
+- Fixed retirement of items in rdbms imports (sf bug 841355)
+- Fixed bug in looking up journal of newly-created items in *dbm backends
 
 
 2003-09-29 0.6.2

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.130 2003-11-10 03:56:39 richard Exp $
+#$Id: back_anydbm.py,v 1.131 2003-11-14 00:11:18 richard 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
@@ -516,7 +516,11 @@ def getjournal(self, classname, nodeid):
             if str(error) == "need 'c' or 'n' flag to open new db":
                 raise IndexError, 'no such %s %s'%(classname, nodeid)
             elif error.args[0] != 2:
+                # this isn't a "not found" error, be alarmed!
                 raise
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         try:
             journal = marshal.loads(db[nodeid])
@@ -936,7 +940,7 @@ def export_list(self, propnames, nodeid):
             l.append(repr(value))
 
         # append retired flag
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
 
         return l
 

roundup/backends/back_bsddb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb.py,v 1.27 2003-09-08 20:39:18 jlgijsbers Exp $
+#$Id: back_bsddb.py,v 1.28 2003-11-14 00:11:18 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in BSDDB.
 '''
@@ -105,7 +105,12 @@ def getjournal(self, classname, nodeid):
             db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname),
                 'r')
         except bsddb.error, error:
-            if error.args[0] != 2: raise
+            if error.args[0] != 2:
+                # this isn't a "not found" error, be alarmed!
+                raise
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         # more handling of bad journals
         if not db.has_key(nodeid):

roundup/backends/back_bsddb3.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb3.py,v 1.20 2003-09-08 20:39:18 jlgijsbers Exp $
+#$Id: back_bsddb3.py,v 1.21 2003-11-14 00:11:18 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in BSDDB3.
 '''
@@ -105,6 +105,9 @@ def getjournal(self, classname, nodeid):
             db = bsddb3.btopen(os.path.join(self.dir, 'journals.%s'%classname),
                 'r')
         except bsddb3._db.DBNoSuchFileError:
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         # more handling of bad journals
         if not db.has_key(nodeid):

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.52 2003-11-12 03:42:12 richard Exp $
+# $Id: back_metakit.py,v 1.53 2003-11-14 00:11:18 richard Exp $
 '''
    Metakit backend for Roundup, originally by Gordon McMillan.
 
@@ -1173,7 +1173,7 @@ def export_list(self, propnames, nodeid):
             l.append(repr(value))
 
         # append retired flag
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
 
         return l
 

roundup/backends/back_postgresql.py

@@ -21,7 +21,7 @@ def sql_open_connection(self):
         try:
             self.conn = psycopg.connect(**db)
         except psycopg.OperationalError, message:
-            raise DatabaseError, message
+            raise hyperdb.DatabaseError, message
 
         self.cursor = self.conn.cursor()
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.69 2003-11-12 03:42:12 richard Exp $
+# $Id: rdbms_common.py,v 1.70 2003-11-14 00:11:19 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1236,7 +1236,7 @@ def export_list(self, propnames, nodeid):
             elif isinstance(proptype, hyperdb.Password):
                 value = str(value)
             l.append(repr(value))
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
         return l
 
     def import_list(self, propnames, proplist):
@@ -1293,6 +1293,9 @@ def import_list(self, propnames, proplist):
         if newid is None:
             newid = self.db.newid(self.classname)
 
+        # add the node and journal
+        self.db.addnode(self.classname, newid, d)
+
         # retire?
         if retire:
             # use the arg for __retired__ to cope with any odd database type
@@ -1303,9 +1306,6 @@ def import_list(self, propnames, proplist):
                 print >>hyperdb.DEBUG, 'retire', (self, sql, newid)
             self.db.cursor.execute(sql, (1, newid))
 
-        # add the node and journal
-        self.db.addnode(self.classname, newid, d)
-
         # extract the extraneous journalling gumpf and nuke it
         if d.has_key('creator'):
             creator = d['creator']

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.7 2003-11-12 03:42:13 richard Exp $ 
+# $Id: db_test_base.py,v 1.8 2003-11-14 00:11:19 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -744,6 +744,59 @@ def testFilteringIntervalSort(self):
 # XXX add sorting tests for other types
 # XXX test auditors and reactors
 
+    def testImportExport(self):
+        # use the filtering setup to create a bunch of items
+        ae, filt = self.filteringSetup()
+        self.db.user.retire('3')
+        self.db.issue.retire('2')
+
+        # grab snapshot of the current database
+        orig = {}
+        for cn,klass in self.db.classes.items():
+            cl = orig[cn] = {}
+            for id in klass.list():
+                it = cl[id] = {}
+                for name in klass.getprops().keys():
+                    it[name] = klass.get(id, name)
+
+        # grab the export
+        export = {}
+        for cn,klass in self.db.classes.items():
+            names = klass.getprops().keys()
+            cl = export[cn] = [names+['is retired']]
+            for id in klass.getnodeids():
+                cl.append(klass.export_list(names, id))
+
+        # shut down this db and nuke it
+        self.db.close()
+        self.nuke_database()
+
+        # open a new, empty database
+        os.makedirs(config.DATABASE + '/files')
+        self.db = self.module.Database(config, 'admin')
+        setupSchema(self.db, 0, self.module)
+
+        # import
+        for cn, items in export.items():
+            klass = self.db.classes[cn]
+            names = items[0]
+            for itemprops in items[1:]:
+                klass.import_list(names, itemprops)
+
+        # grab snapshot of the current database
+        for cn, items in orig.items():
+            klass = self.db.classes[cn]
+            # ensure retired items are retired :)
+            l = items.keys(); l.sort()
+            m = klass.list(); m.sort()
+            ae(l, m)
+            for id, props in items.items():
+                for name, value in props.items():
+                    ae(klass.get(id, name), value)
+
+        # make sure the retired items are actually imported
+        ae(self.db.user.get('3', 'username'), 'blop')
+        ae(self.db.issue.get('2', 'title'), 'issue two')
 
 class ROTest(MyTestCase):
     def setUp(self):

test/test_anydbm.py

@@ -15,15 +15,18 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_anydbm.py,v 1.1 2003-10-25 22:53:26 richard Exp $ 
+# $Id: test_anydbm.py,v 1.2 2003-11-14 00:11:19 richard Exp $ 
 
 import unittest, os, shutil, time
 
-from db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest
+from db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
 
 class anydbmOpener:
     from roundup.backends import anydbm as module
 
+    def nuke_database(self):
+        shutil.rmtree(config.DATABASE)
+
 class anydbmDBTest(anydbmOpener, DBTest):
     pass
 

test/test_bsddb.py

@@ -15,18 +15,20 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_bsddb.py,v 1.1 2003-10-25 22:53:26 richard Exp $ 
+# $Id: test_bsddb.py,v 1.2 2003-11-14 00:11:19 richard Exp $ 
 
 import unittest, os, shutil, time
 
-from db_test_base import DBTest, ROTest, SchemaTest, \
-    ClassicInitTest
+from db_test_base import DBTest, ROTest, SchemaTest, ClassicInitTest, config
 from roundup import backends
 
 class bsddbOpener:
     if hasattr(backends, 'bsddb'):
         from roundup.backends import bsddb as module
 
+    def nuke_database(self):
+        shutil.rmtree(config.DATABASE)
+
 class bsddbDBTest(bsddbOpener, DBTest):
     pass