merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,7 @@ Fixed:
 - fix setup.py to work with <Python2.3 (sf bug 1082801)
 - fix permissions checks in cgi templating (sf bug 1082755)
 - fix "Users may only edit their issues" example in docs
+- handle ~/.my.cnf files for MySQL defaults (sf bug 1096031)
 
 
 2004-12-08 0.8.0b1
@@ -61,7 +62,13 @@ Fixed:
 - demo tracker is always set up on localhost (sf bug 1049101)
 
 
-2004-10-06 0.7.11
+2004-??-?? 0.7.??
+Fixed:
+- handle capitalisation of class names in text hyperlinking (sf bug
+  1101043)
+
+
+2005-01-06 0.7.11
 Fixed:
 - index args URL generation broken in .10 (sf bug 1096027)
 - handle NotModified for non-static files (sf patch 1095790)

roundup/backends/back_postgresql.py

@@ -14,6 +14,15 @@
 from roundup import hyperdb, date
 from roundup.backends import rdbms_common
 
+def connection_dict(config, dbnamestr=None):
+    ''' read_default_group is MySQL-specific, ignore it '''
+    d = rdbms_common.connection_dict(config, dbnamestr)
+    if d.has_key('read_default_group'):
+        del d['read_default_group']
+    if d.has_key('read_default_file'):
+        del d['read_default_file']
+    return d
+
 def db_create(config):
     """Clear all database contents and drop database itself"""
     command = 'CREATE DATABASE %s'%config.RDBMS_NAME
@@ -33,7 +42,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 = rdbms_common.connection_dict(config)
+    template1 = connection_dict(config)
     template1['database'] = 'template1'
 
     try:
@@ -70,7 +79,7 @@ def pg_command(cursor, command):
 
 def db_exists(config):
     """Check if database already exists"""
-    db = rdbms_common.connection_dict(config, 'database')
+    db = connection_dict(config, 'database')
     try:
         conn = psycopg.connect(**db)
         conn.close()
@@ -85,7 +94,7 @@ class Database(rdbms_common.Database):
     implements_intersect = 1
 
     def sql_open_connection(self):
-        db = rdbms_common.connection_dict(self.config, 'database')
+        db = connection_dict(self.config, 'database')
         self.config.logging.getLogger('hyperdb').info('open database %r'%(
             db['database'],))
         try:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.2 2005-01-06 17:58:52 a1s Exp $
+# $Id: rdbms_common.py,v 1.142.2.3 2005-01-13 05:05:12 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -68,7 +68,8 @@ def connection_dict(config, dbnamestr=None):
     d = { }
     if dbnamestr:
         d[dbnamestr] = config.RDBMS_NAME
-    for name in 'host', 'port', 'password', 'user':
+    for name in ('host', 'port', 'password', 'user', 'read_default_group',
+            'read_default_file'):
         cvar = 'RDBMS_'+name.upper()
         if config[cvar] is not None:
             d[name] = config[cvar]

roundup/configuration.py

@@ -1,6 +1,6 @@
 # Roundup Issue Tracker configuration support
 #
-# $Id: configuration.py,v 1.23 2004-11-18 14:02:25 a1s Exp $
+# $Id: configuration.py,v 1.23.2.1 2005-01-13 05:05:11 richard Exp $
 #
 __docformat__ = "restructuredtext"
 
@@ -484,6 +484,12 @@ class NullableFilePathOption(NullableOption, FilePathOption):
         (NullableOption, 'password', 'roundup',
             "Database user password.",
             ['MYSQL_DBPASSWORD']),
+        (NullableOption, 'read_default_file', '~/.my.cnf',
+            "Name of the MySQL defaults file.\n"
+            "Only used in MySQL connections."),
+        (NullableOption, 'read_default_group', 'roundup',
+            "Name of the group to use in the MySQL defaults file (.my.cnf).\n"
+            "Only used in MySQL connections."),
     ), "Settings in this section are used"
         " by Postgresql and MySQL backends only"
     ),