postgres backend open doesn't hide corruption in schema [SF#956375]

*dbm-style backends nuke() method now clear id counters

Author: Richard Jones

CHANGES.txt

@@ -29,6 +29,10 @@ Feature:
 - relaxed hyperlinking in web interface (accept "issue123" or "Issue 123")
 - record journaltag lookup ("fixes" sf bug 998140)
 
+Fixed:
+- postgres backend open doesn't hide corruption in schema (sf bug 956375)
+- *dbm-style backends nuke() method now clear id counters
+
 
 2004-??-?? 0.7.7
 Fixed:

roundup/admin.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: admin.py,v 1.78 2004-07-28 05:00:30 richard Exp $
+# $Id: admin.py,v 1.79 2004-10-08 05:37:44 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -453,9 +453,14 @@ def do_initialise(self, tracker_home, args):
             if ok.strip().lower() != 'y':
                 return 0
 
+            backend = tracker.get_backend_name()
+
             # nuke it
             tracker.nuke()
 
+            # re-write the backend select file
+            init.write_select_db(tracker_home, backend)
+
         # GO
         tracker.init(password.Password(adminpw))
 

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.172 2004-09-29 07:09:13 a1s Exp $
+#$Id: back_anydbm.py,v 1.173 2004-10-08 05:37:44 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
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -46,12 +46,12 @@
 def db_exists(config):
     # check for the user db
     for db in 'nodes.user nodes.user.db'.split():
-        if os.path.exists(os.path.join(config.TRACKER_HOME, 'db', db)):
+        if os.path.exists(os.path.join(config.DATABASE, db)):
             return 1
     return 0
 
 def db_nuke(config):
-    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+    shutil.rmtree(config.DATABASE)
 
 #
 # Now the database
@@ -185,6 +185,12 @@ def clear(self):
                     os.remove(path)
                 elif os.path.exists(path+'.db'):    # dbm appends .db
                     os.remove(path+'.db')
+        # reset id sequences
+        path = os.path.join(os.getcwd(), self.dir, '_ids')
+        if os.path.exists(path):
+            os.remove(path)
+        elif os.path.exists(path+'.db'):    # dbm appends .db
+            os.remove(path+'.db')
 
     def getclassdb(self, classname, mode='r'):
         ''' grab a connection to the class db that will be used for

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.32 2004-07-27 01:59:28 richard Exp $
+#$Id: back_bsddb.py,v 1.33 2004-10-08 05:37:44 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in BSDDB.
 '''
 __docformat__ = 'restructuredtext'
@@ -27,10 +27,10 @@
 from back_anydbm import Database, Class, FileClass, IssueClass
 
 def db_exists(config):
-    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'nodes.user'))
+    return os.path.exists(os.path.join(config.DATABASE, 'nodes.user'))
 
 def db_nuke(config):
-    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+    shutil.rmtree(config.DATABASE)
 
 #
 # Now the database
@@ -46,6 +46,8 @@ def clear(self):
             bsddb.btopen(db, 'n')
             db = os.path.join(self.dir, 'journals.%s'%cn)
             bsddb.btopen(db, 'n')
+        # reset id sequences
+        os.remove(os.path.join(os.getcwd(), self.dir, '_ids'))
 
     def getclassdb(self, classname, mode='r'):
         ''' grab a connection to the class db that will be used for

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.26 2004-07-27 01:59:28 richard Exp $
+#$Id: back_bsddb3.py,v 1.27 2004-10-08 05:37:44 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in BSDDB3.
 '''
 __docformat__ = 'restructuredtext'
@@ -27,10 +27,10 @@
 from back_anydbm import Database, Class, FileClass, IssueClass
 
 def db_exists(config):
-    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'nodes.user'))
+    return os.path.exists(os.path.join(config.DATABASE, 'nodes.user'))
 
 def db_nuke(config):
-    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+    shutil.rmtree(config.DATABASE)
 
 #
 # Now the database
@@ -48,6 +48,8 @@ def clear(self):
                 except os.error, error:
                     if error.errno != errno.ENOENT:
                         raise
+        # reset id sequences
+        os.remove(os.path.join(os.getcwd(), self.dir, '_ids'))
 
     def getclassdb(self, classname, mode='r'):
         ''' grab a connection to the class db that will be used for

roundup/backends/back_postgresql.py

@@ -102,7 +102,9 @@ def open_connection(self):
 
         try:
             self.load_dbschema()
-        except:
+        except psycopg.ProgrammingError, message:
+            if '"schema" does not exist' not in str(message):
+                raise
             self.rollback()
             self.init_dbschema()
             self.sql("CREATE TABLE schema (schema TEXT)")

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.33 2004-10-07 06:30:20 richard Exp $
+# $Id: back_sqlite.py,v 1.34 2004-10-08 05:37:44 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -17,10 +17,10 @@
 import sqlite
 
 def db_exists(config):
-    return os.path.exists(os.path.join(config.TRACKER_HOME, 'db', 'db'))
+    return os.path.exists(os.path.join(config.DATABASE, 'db'))
 
 def db_nuke(config):
-    shutil.rmtree(os.path.join(config.TRACKER_HOME, 'db'))
+    shutil.rmtree(config.DATABASE)
 
 class Database(rdbms_common.Database):
     # char to use for positional arguments

roundup/instance.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: instance.py,v 1.23 2004-09-29 07:26:17 a1s Exp $
+# $Id: instance.py,v 1.24 2004-10-08 05:37:44 richard Exp $
 
 '''Tracker handling (open tracker).
 
@@ -39,11 +39,15 @@ def __init__(self, tracker_home):
         self.cgi_actions = {}
         self.templating_utils = {}
 
-    def get_backend(self):
+    def get_backend_name(self):
         o = __builtins__['open']
         f = o(os.path.join(self.tracker_home, 'db', 'backend_name'))
         name = f.readline().strip()
         f.close()
+        return name
+
+    def get_backend(self):
+        name = self.get_backend_name()
         return getattr(backends, name)
 
     def open(self, name):