Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Improved error message if DATABASE_ENGINE is invalid.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit dc378e8ca7fd099ebf6fda37503db172d445c6d4 1 parent 8e9833f
Adrian Holovaty adrianholovaty authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 django/db/__init__.py
7 django/db/__init__.py
View
@@ -17,8 +17,11 @@
backend_dir = os.path.join(__path__[0], 'backends')
available_backends = [f for f in os.listdir(backend_dir) if not f.startswith('_') and not f.startswith('.') and not f.endswith('.py') and not f.endswith('.pyc')]
available_backends.sort()
- raise ImproperlyConfigured, "Could not load database backend: %s. Is your DATABASE_ENGINE setting (currently, %r) spelled correctly? Available options are: %s" % \
- (e, settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends)))
+ if settings.DATABASE_ENGINE not in available_backends:
+ raise ImproperlyConfigured, "%r isn't an available database backend. vailable options are: %s" % \
+ (settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends)))
+ else:
+ raise # If there's some other error, this must be an error in Django itself.
get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', [''])
get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])
Please sign in to comment.
Something went wrong with that request. Please try again.