p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #10364 -- Correctly identify test spatial database creation errors to the user. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-04-19 23:31:14 +00:00
parent be11bd40d4
commit bfe36750b1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/gis/db/backend/postgis/creation.py
View File

@ -46,7 +46,8 @@ def _create_with_cursor(db_name, verbosity=1, autoclobber=False):
# Trying to create the database first. # Trying to create the database first.
cursor.execute(create_sql) cursor.execute(create_sql)
except Exception, e: except Exception, e:
# Drop and recreate, if necessary. if 'already exists' in e.pgerror.lower():
# Database already exists, drop and recreate if user agrees.
if not autoclobber: if not autoclobber:
confirm = raw_input("\nIt appears the database, %s, already exists. Type 'yes' to delete it, or 'no' to cancel: " % db_name) confirm = raw_input("\nIt appears the database, %s, already exists. Type 'yes' to delete it, or 'no' to cancel: " % db_name)
if autoclobber or confirm == 'yes': if autoclobber or confirm == 'yes':
@ -55,7 +56,9 @@ def _create_with_cursor(db_name, verbosity=1, autoclobber=False):
if verbosity >= 1: print 'Creating new spatial database...' if verbosity >= 1: print 'Creating new spatial database...'
cursor.execute(create_sql) cursor.execute(create_sql)
else: else:
raise Exception('Spatial Database Creation canceled.') raise Exception('Spatial database creation canceled.')
else:
raise Exception('Spatial database creation failed: "%s"' % e.pgerror.strip())
created_regex = re.compile(r'^createdb: database creation failed: ERROR: database ".+" already exists') created_regex = re.compile(r'^createdb: database creation failed: ERROR: database ".+" already exists')
def _create_with_shell(db_name, verbosity=1, autoclobber=False): def _create_with_shell(db_name, verbosity=1, autoclobber=False):