diff roundup/backends/back_postgresql.py @ 3100:406862712b7d maint-0.8

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Thu, 13 Jan 2005 05:05:12 +0000
parents d6b848497747
children e1da7b5b04ab
line wrap: on
line diff
--- a/roundup/backends/back_postgresql.py	Thu Jan 13 04:50:11 2005 +0000
+++ b/roundup/backends/back_postgresql.py	Thu Jan 13 05:05:12 2005 +0000
@@ -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 @@
     '''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 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 @@
     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 Issue Tracker: http://roundup-tracker.org/