Author: ianb
Date: 2006-05-09 11:07:53 -0600 (Tue, 09 May 2006)
New Revision: 1762
Modified:
SQLObject/trunk/sqlobject/manager/command.py
Log:
merged 1760:1761 from 0.7-bugfix branch
Modified: SQLObject/trunk/sqlobject/manager/command.py
===================================================================
--- SQLObject/trunk/sqlobject/manager/command.py 2006-05-09 17:06:33 UTC (rev 1761)
+++ SQLObject/trunk/sqlobject/manager/command.py 2006-05-09 17:07:53 UTC (rev 1762)
@@ -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)
|
