summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-04-16 12:44:32 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-04-16 12:44:32 +0000
commitf0d75dbe3e7f3715130921214330f088134159cb (patch)
tree55ed2e0ec4b182e884723f140e680195ec7f635e
parentbd8afb18940b3e4f711b714dd20abf1053e31e70 (diff)
Fixed #10833 -- Corrected load_backend so that it actually loads the requested backend, rather than always loading settings.DATABASE_BACKEND. Thanks to Alex Gaynor for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/__init__.py b/django/db/__init__.py
index dde2f2eb22..61c7a4fc74 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -14,7 +14,7 @@ def load_backend(backend_name):
try:
# Most of the time, the database backend will be one of the official
# backends that ships with Django, so look there first.
- return import_module('.base', 'django.db.backends.%s' % settings.DATABASE_ENGINE)
+ return import_module('.base', 'django.db.backends.%s' % backend_name)
except ImportError, e:
# If the import failed, we might be looking for a database backend
# distributed external to Django. So we'll try that next.