innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #10487 -- Refactored the database-backend-selection logic into a function, django.db.load_backend. Thanks to Alex Gaynor for the initial patch 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2009-03-13 04:41:45 +00:00
parent c3dc837950
commit d8744cca26
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/db/__init__.py
View File

@ -9,17 +9,16 @@ __all__ = ('backend', 'connection', 'DatabaseError', 'IntegrityError')
if not settings.DATABASE_ENGINE: if not settings.DATABASE_ENGINE:
settings.DATABASE_ENGINE = 'dummy' settings.DATABASE_ENGINE = 'dummy'
def load_backend(backend_name):
try: try:
# Most of the time, the database backend will be one of the official # Most of the time, the database backend will be one of the official
# backends that ships with Django, so look there first. # backends that ships with Django, so look there first.
_import_path = 'django.db.backends.' return __import__('django.db.backends.%s.base' % backend_name, {}, {}, [''])
backend = __import__('%s%s.base' % (_import_path, settings.DATABASE_ENGINE), {}, {}, [''])
except ImportError, e: except ImportError, e:
# If the import failed, we might be looking for a database backend # If the import failed, we might be looking for a database backend
# distributed external to Django. So we'll try that next. # distributed external to Django. So we'll try that next.
try: try:
_import_path = '' return __import__('%s.base' % backend_name, {}, {}, [''])
backend = __import__('%s.base' % settings.DATABASE_ENGINE, {}, {}, [''])
except ImportError, e_user: except ImportError, e_user:
# The database backend wasn't found. Display a helpful error message # The database backend wasn't found. Display a helpful error message
# listing all possible (built-in) database backends. # listing all possible (built-in) database backends.
@ -30,12 +29,15 @@ except ImportError, e:
except EnvironmentError: except EnvironmentError:
available_backends = [] available_backends = []
available_backends.sort() available_backends.sort()
if settings.DATABASE_ENGINE not in available_backends: if backend_name not in available_backends:
raise ImproperlyConfigured, "%r isn't an available database backend. Available options are: %s\nError was: %s" % \ error_msg = "%r isn't an available database backend. Available options are: %s\nError was: %s" % \
(settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends)), e_user) (backend_name, ", ".join(map(repr, available_backends)), e_user)
raise ImproperlyConfigured(error_msg)
else: else:
raise # If there's some other error, this must be an error in Django itself. raise # If there's some other error, this must be an error in Django itself.
backend = load_backend(settings.DATABASE_ENGINE)
# `connection`, `DatabaseError` and `IntegrityError` are convenient aliases # `connection`, `DatabaseError` and `IntegrityError` are convenient aliases
# for backend bits. # for backend bits.