--- roundup/backends/back_mysql.py	2005-01-03 22:09:00.000000000 -0500
+++ roundup/backends/back_mysql.py	2005-01-06 15:53:03.375392584 -0500
@@ -43,10 +43,9 @@
 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)
+        conn = MySQLdb.connect(**config.MYSQL)
         try:
-            conn.select_db(config.MYSQL_DBNAME)
+            conn.select_db(config.MYSQL['db'])
         except:
             # no, it doesn't exist
             pass
@@ -59,8 +58,8 @@
                     print >>hyperdb.DEBUG, 'DROP TABLE %s'%table[0]
                 cursor.execute("DROP TABLE %s"%table[0])
             if __debug__:
-                print >>hyperdb.DEBUG, "DROP DATABASE %s"%config.MYSQL_DBNAME
-            cursor.execute("DROP DATABASE %s"%config.MYSQL_DBNAME)
+                print >>hyperdb.DEBUG, "DROP DATABASE %s"%config.MYSQL['db']
+            cursor.execute("DROP DATABASE %s"%config.MYSQL['db'])
             conn.commit()
         conn.close()
 
@@ -69,23 +68,21 @@
 
 def db_create(config):
     """Create the database."""
-    conn = MySQLdb.connect(config.MYSQL_DBHOST, config.MYSQL_DBUSER,
-        config.MYSQL_DBPASSWORD)
+    conn = MySQLdb.connect(**config.MYSQL)
     cursor = conn.cursor()
     if __debug__:
-        print >>hyperdb.DEBUG, "CREATE DATABASE %s"%config.MYSQL_DBNAME
-    cursor.execute("CREATE DATABASE %s"%config.MYSQL_DBNAME)
+        print >>hyperdb.DEBUG, "CREATE DATABASE %s"%config.MYSQL['db']
+    cursor.execute("CREATE DATABASE %s"%config.MYSQL['db'])
     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)
+    conn = MySQLdb.connect(**config.MYSQL)
 #    tables = None
     try:
         try:
-            conn.select_db(config.MYSQL_DBNAME)
+            conn.select_db(config.MYSQL['db'])
 #            cursor = conn.cursor()
 #            cursor.execute("SHOW TABLES")
 #            tables = cursor.fetchall()
@@ -93,12 +90,12 @@
 #                print >>hyperdb.DEBUG, "tables %s"%(tables,)
         except MySQLdb.OperationalError:
             if __debug__:
-                print >>hyperdb.DEBUG, "no database '%s'"%config.MYSQL_DBNAME
+                print >>hyperdb.DEBUG, "no database '%s'"%config.MYSQL['db']
             return 0
     finally:
         conn.close()
     if __debug__:
-        print >>hyperdb.DEBUG, "database '%s' exists"%config.MYSQL_DBNAME
+        print >>hyperdb.DEBUG, "database '%s' exists"%config.MYSQL['db']
     return 1
 
 
@@ -137,9 +134,8 @@
     }
 
     def sql_open_connection(self):
-        db = getattr(self.config, 'MYSQL_DATABASE')
         try:
-            conn = MySQLdb.connect(*db)
+            conn = MySQLdb.connect(**self.config.MYSQL)
         except MySQLdb.OperationalError, message:
             raise DatabaseError, message
         cursor = conn.cursor()