Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10364 -- Correctly identify test spatial database crea…

…tion errors to the user.

Backport of r10603 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit dd51cf9876fb71db080aad767a386c0c3988b114 1 parent 1c925f6
Justin Bronn jbronn authored
Showing with 12 additions and 9 deletions.
  1. +12 −9 django/contrib/gis/db/backend/postgis/creation.py
21 django/contrib/gis/db/backend/postgis/creation.py
View
@@ -54,16 +54,19 @@ def _create_with_cursor(db_name, verbosity=1, autoclobber=False):
cursor.execute(create_sql)
#print create_sql
except Exception, e:
- # Drop and recreate, if necessary.
- if not autoclobber:
- 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 verbosity >= 1: print 'Destroying old spatial database...'
- drop_db(db_name)
- if verbosity >= 1: print 'Creating new spatial database...'
- cursor.execute(create_sql)
+ if 'already exists' in e.pgerror.lower():
+ # Database already exists, drop and recreate if user agrees.
+ if not autoclobber:
+ 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 verbosity >= 1: print 'Destroying old spatial database...'
+ drop_db(db_name)
+ if verbosity >= 1: print 'Creating new spatial database...'
+ cursor.execute(create_sql)
+ else:
+ raise Exception('Spatial Database Creation canceled.')
else:
- raise Exception('Spatial Database Creation canceled.')
+ raise Exception('Spatial database creation failed: "%s"' % e.pgerror.strip())
created_regex = re.compile(r'^createdb: database creation failed: ERROR: database ".+" already exists')
def _create_with_shell(db_name, verbosity=1, autoclobber=False):
Please sign in to comment.
Something went wrong with that request. Please try again.