Author: phd
Date: 2006-05-17 08:14:28 -0600 (Wed, 17 May 2006)
New Revision: 1769
Modified:
home/phd/SQLObject/paramstyles/sqlobject/manager/command.py
Log:
Merged patches from the revisions 1760:1768 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/manager/command.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/manager/command.py 2006-05-14 21:37:11 UTC (rev 1768)
+++ home/phd/SQLObject/paramstyles/sqlobject/manager/command.py 2006-05-17 14:14:28 UTC (rev 1769)
@@ -553,7 +553,13 @@
if (self.options.create_db
and soClass._connection not in dbs_created):
if not self.options.simulate:
- soClass._connection.createEmptyDatabase()
+ try:
+ soClass._connection.createEmptyDatabase()
+ except soClass._connection.module.ProgrammingError, e:
+ if str(e).find('already exists') != -1:
+ print 'Database already exists'
+ else:
+ raise
else:
print '(simulating; cannot create database)'
dbs_created.append(soClass._connection)
|
