From: Graeme M. <ma...@us...> - 2005-05-25 15:05:44
|
Update of /cvsroot/mailmanager/mailmanager/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29194 Modified Files: Tag: RELENG_2_0 setupdb.py Log Message: Tweak setupdb.py so it works on my system (Mac OS X, python 2.4) again. Hopefully I haven't broken it for win32 again... :-) Index: setupdb.py =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/scripts/setupdb.py,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- setupdb.py 6 May 2005 13:05:47 -0000 1.2.2.2 +++ setupdb.py 25 May 2005 15:05:34 -0000 1.2.2.3 @@ -49,10 +49,13 @@ global _con if _con: _con.close() _con = psycopg.connect(' '.join(dsn)) + # There's some things we don't want to enclose in a BEGIN + # TRANSACTION / COMMIT block since pgsql doesn't really like + # creating databases in a transaction... if not transactional: - _con.set_isolation_level(0) # Autocommit + _con.set_isolation_level(0) else: - _con.set_isolation_level(2) # Serialised + _con.autocommit(True) return _con.cursor() def createDatabase(dbname, mm_user, mm_password, su_user, su_pass, @@ -73,8 +76,11 @@ cur.execute('GRANT ALL ON DATABASE %s to %s;' % (dbname, mm_user)) cur.close() if tsearch: - os.system('createlang --username=%s plpgsql %s' % (su_user, dbname)) - os.system('psql -U %s -q -f %s %s' % (su_user, tsearch_file, dbname)) + os.system('createlang %s plpgsql %s' % (su_user and + '--username=%s' % + su_user or '', dbname)) + os.system('psql %s -q -f %s %s' % (su_user and '-U %s' % su_user or + '', tsearch_file, dbname)) cur = getCursor(dbname, user = su_user, password = su_pass, transactional = False) cur.execute("SHOW lc_ctype") @@ -120,7 +126,7 @@ type='string', help='The password for the ' 'PostgreSQL super user, if required.') parser.add_option('-t', '--enable-text-search', dest='tsearch', - action='store_true', default=False, + action='store_true', default=True, help='Enable full text searching') parser.add_option('-c', '--schema', dest='schema', type='string', help='The name of a schema to create the tables ' @@ -132,7 +138,7 @@ parser.add_option('-a', '--tsearch-sql', dest='tsearch_file', type='string', help='The location of PostgreSQL\'s' ' tsearch2.sql', - default='/opt/local/share/postgresql-7.4.7/contrib/tsearch2.sql') + default='/opt/local/share/postgresql8/contrib/tsearch2.sql') return parser.parse_args() |