Both RDBMS backends now use the same config.ini section, [rdbms].

Comments on each option clearly state that the options only apply to
postgresql or mysql.

Author: Richard Jones

roundup/backends/back_mysql.py

@@ -39,27 +39,27 @@
 import os, shutil
 from MySQLdb.constants import ER
 
-
 def db_nuke(config):
     """Clear all database contents and drop database itself"""
     if db_exists(config):
-        conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
-            config.MYSQL_DBPASSWORD)
+        kwargs = rdbms_common.connection_dict(config)
+        conn = MySQLdb.connect(**kwargs)
         try:
-            conn.select_db(config.MYSQL_DBNAME)
+            conn.select_db(config.RDBMS_NAME)
         except:
             # no, it doesn't exist
             pass
         else:
             cursor = conn.cursor()
             cursor.execute("SHOW TABLES")
             tables = cursor.fetchall()
+            # stupid MySQL bug requires us to drop all the tables first
             for table in tables:
                 command = 'DROP TABLE %s'%table[0]
                 if __debug__:
                     config.logging.getLogger('hyperdb').debug(command)
                 cursor.execute(command)
-            command = "DROP DATABASE %s"%config.MYSQL_DBNAME
+            command = "DROP DATABASE %s"%config.RDBMS_NAME
             config.logging.getLogger('hyperdb').info(command)
             cursor.execute(command)
             conn.commit()
@@ -70,28 +70,22 @@ def db_nuke(config):
 
 def db_create(config):
     """Create the database."""
-    conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
-        config.MYSQL_DBPASSWORD)
+    kwargs = rdbms_common.connection_dict(config)
+    conn = MySQLdb.connect(**kwargs)
     cursor = conn.cursor()
-    command = "CREATE DATABASE %s"%config.MYSQL_DBNAME
+    command = "CREATE DATABASE %s"%config.RDBMS_NAME
     config.logging.getLogger('hyperdb').info(command)
     cursor.execute(command)
     conn.commit()
     conn.close()
 
 def db_exists(config):
     """Check if database already exists."""
-    conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
-        config.MYSQL_DBPASSWORD)
-#    tables = None
+    kwargs = rdbms_common.connection_dict(config)
+    conn = MySQLdb.connect(**kwargs)
     try:
         try:
-            conn.select_db(config.MYSQL_DBNAME)
-#            cursor = conn.cursor()
-#            cursor.execute("SHOW TABLES")
-#            tables = cursor.fetchall()
-#            if __debug__:
-#                print >>hyperdb.DEBUG, "tables %s"%(tables,)
+            conn.select_db(config.RDBMS_NAME)
         except MySQLdb.OperationalError:
             return 0
     finally:
@@ -131,10 +125,11 @@ class Database(Database):
     }
 
     def sql_open_connection(self):
-        db = getattr(self.config, 'MYSQL_DATABASE')
-        self.config.logging.getLogger('hyperdb').info('open database %r'%(db,))
+        kwargs = rdbms_common.connection_dict(config, 'db')
+        self.config.logging.getLogger('hyperdb').info('open database %r'%(
+            kwargs['db'],))
         try:
-            conn = MySQLdb.connect(*db)
+            conn = MySQLdb.connect(**kwargs)
         except MySQLdb.OperationalError, message:
             raise DatabaseError, message
         cursor = conn.cursor()

roundup/backends/back_postgresql.py

@@ -14,37 +14,15 @@
 from roundup import hyperdb, date
 from roundup.backends import rdbms_common
 
-from roundup import configuration
-
-configuration.SETTINGS += (
-    ("postgresql", (
-        (configuration.Option, 'database', 'roundup'),
-        (configuration.NullableOption, 'host', 'localhost'),
-        (configuration.NullableOption, 'port', '5432'),
-        (configuration.NullableOption, 'user', 'roundup'),
-        (configuration.NullableOption, 'password', 'roundup'),
-    )),
-)
-
-def connection_dict(config):
-    d = {
-        'database': config.POSTGRESQL_DATABASE,
-    }
-    for name in 'host', 'port', 'password', 'user':
-        cvar = 'POSTGRESQL_'+name.upper()
-        if config[cvar] is not None:
-            d[name] = config[cvar]
-    return d
-
 def db_create(config):
     """Clear all database contents and drop database itself"""
-    command = 'CREATE DATABASE %s'%config.POSTGRESQL_DATABASE
+    command = 'CREATE DATABASE %s'%config.RDBMS_NAME
     config.logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
 def db_nuke(config, fail_ok=0):
     """Clear all database contents and drop database itself"""
-    command = 'DROP DATABASE %s'% config.POSTGRESQL_DATABASE
+    command = 'DROP DATABASE %s'% config.RDBMS_NAME
     config.logging.getLogger('hyperdb').info(command)
     db_command(config, command)
 
@@ -55,7 +33,7 @@ def db_command(config, command):
     '''Perform some sort of database-level command. Retry 10 times if we
     fail by conflicting with another user.
     '''
-    template1 = connection_dict(config)
+    template1 = rdbms_common.connection_dict(config)
     template1['database'] = 'template1'
 
     try:
@@ -92,7 +70,7 @@ def pg_command(cursor, command):
 
 def db_exists(config):
     """Check if database already exists"""
-    db = connection_dict(config)
+    db = rdbms_common.connection_dict(config, 'database')
     try:
         conn = psycopg.connect(**db)
         conn.close()
@@ -104,8 +82,9 @@ class Database(rdbms_common.Database):
     arg = '%s'
 
     def sql_open_connection(self):
-        db = connection_dict(config)
-        self.config.logging.getLogger('hyperdb').info('open database %r'%db)
+        db = rdbms_common.connection_dict(config, 'database')
+        self.config.logging.getLogger('hyperdb').info('open database %r'%(
+            db['database'],))
         try:
             conn = psycopg.connect(**db)
         except psycopg.OperationalError, message:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.124 2004-07-20 05:58:07 richard Exp $
+# $Id: rdbms_common.py,v 1.125 2004-07-27 01:18:25 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -59,6 +59,18 @@ def _bool_cvt(value):
     # assume it's a number returned from the db API
     return int(value)
 
+def connection_dict(config, dbnamestr=None):
+    ''' Used by Postgresql and MySQL to detemine the keyword args for
+    opening the database connection.'''
+    d = { }
+    if dbnamestr:
+        d[dbnamestr] = config.RDBMS_NAME
+    for name in 'host', 'port', 'password', 'user':
+        cvar = 'RDBMS_'+name.upper()
+        if config[cvar] is not None:
+            d[name] = config[cvar]
+    return d
+
 class Database(FileStorage, hyperdb.Database, roundupdb.Database):
     ''' Wrapper around an SQL database that presents a hyperdb interface.
 

roundup/configuration.py

@@ -1,6 +1,6 @@
 # Roundup Issue Tracker configuration support
 #
-# $Id: configuration.py,v 1.10 2004-07-26 09:13:17 a1s Exp $
+# $Id: configuration.py,v 1.11 2004-07-27 01:18:25 richard Exp $
 #
 __docformat__ = "restructuredtext"
 
@@ -444,6 +444,18 @@ class NullableFilePathOption(NullableOption, FilePathOption):
         (MailAddressOption, "email", "issue_tracker",
             "Email address that mail to roundup should go to."),
     )),
+    ("rdbms", (
+        (Option, 'name', 'roundup',
+            "Name of the Postgresql or MySQL database to use."),
+        (NullableOption, 'host', 'localhost'
+            "Hostname that the Postgresql or MySQL database resides on."),
+        (NullableOption, 'port', '5432'
+            "Port number that the Postgresql or MySQL database resides on."),
+        (NullableOption, 'user', 'roundup'
+            "Postgresql or MySQL database user that Roundup should use."),
+        (NullableOption, 'password', 'roundup',
+            "Password for the Postgresql or MySQL database user."),
+    )),
     ("logging", (
         (FilePathOption, "config", "",
             "Path to configuration file for standard Python logging module.\n"