Changeset 6316

Timestamp:

09/15/07 14:25:20 (8 months ago)

Author:

jacob

Message:

Fixed #5454: settings.DATABASE_BACKEND may now refer to an external package (i.e. one located outside the Django source. Thanks, George Vilches.

Files:

• django/trunk/django/db/__init__.py (modified) (2 diffs)
• django/trunk/docs/settings.txt (modified) (1 diff)

django/trunk/django/db/__init__.py

@@ +1 @@
+import os
-from django.conf import settings
-from django.core import signals
+from django.core.exceptions import ImproperlyConfigured
-from django.dispatch import dispatcher
+from django.utils.functional import curry
-
-__all__ = ('backend', 'connection', 'DatabaseError', 'IntegrityError')
@@ -9 +12 @@
-
-try:
-
+
+
+
+
-except ImportError, e:
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-runshell = lambda: __import__('django.db.backends.%s.client' % settings.DATABASE_ENGINE, {}, {}, ['']).runshell(
+
+
+    return __import__('%s%s.%s' % (_import_path, settings.DATABASE_ENGINE, module_name), {}, {}, ['']
-
+# We don't want to import the introspect/creation modules unless 
+# someone asks for 'em, so lazily load them on demmand.
+get_introspection_module = curry(_import_database_module, _import_path, 'introspection')
+get_creation_module = curry(_import_database_module, _import_path, 'creation')
+
+# We want runshell() to work the same way, but we have to treat it a
+# little differently (since it just runs instead of returning a module like
+# the above) and wrap the lazily-loaded runshell() method.
+runshell = lambda: _import_database_module(_import_path, "client").runshell()
+
+# Convenient aliases for backend bits.
-connection = backend.DatabaseWrapper(**settings.DATABASE_OPTIONS)
-DatabaseError = backend.DatabaseError

django/trunk/docs/settings.txt

@@ -254 +254 @@
-Default: ``''`` (Empty string)
-
-
-
-
+
+
+
+
+
+
+
+
-
-DATABASE_HOST