p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now look for `DatabaseError` during PostGIS backend initialization, as it is now raised instead of a `ProgrammingError` after changes in r12352. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2010-01-29 17:58:55 +00:00
parent 199cd0efca
commit 901b60e7e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/gis/db/backends/postgis/operations.py
View File

@ -8,7 +8,8 @@ from django.contrib.gis.db.backends.postgis.adapter import PostGISAdapter
from django.contrib.gis.geometry.backend import Geometry from django.contrib.gis.geometry.backend import Geometry
from django.contrib.gis.measure import Distance from django.contrib.gis.measure import Distance
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db.backends.postgresql_psycopg2.base import Database, DatabaseOperations from django.db.backends.postgresql_psycopg2.base import DatabaseOperations
from django.db.utils import DatabaseError
#### Classes used in constructing PostGIS spatial SQL #### #### Classes used in constructing PostGIS spatial SQL ####
class PostGISOperator(SpatialOperation): class PostGISOperator(SpatialOperation):
@ -99,7 +100,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
self.geom_func_prefix = prefix self.geom_func_prefix = prefix
self.spatial_version = version self.spatial_version = version
except Database.ProgrammingError: except DatabaseError:
raise ImproperlyConfigured('Cannot determine PostGIS version for database "%s". ' raise ImproperlyConfigured('Cannot determine PostGIS version for database "%s". '
'GeoDjango requires at least PostGIS version 1.3. ' 'GeoDjango requires at least PostGIS version 1.3. '
'Was the database created from a spatial database ' 'Was the database created from a spatial database '