Ticket #9628: 9628-r9791-optionA.diff

django/db/backends/sqlite3/base.py

@@ -11 +11 @@
 from django.db.backends.sqlite3.creation import DatabaseCreation
 from django.db.backends.sqlite3.introspection import DatabaseIntrospection
 from django.utils.safestring import SafeString
+from django.conf import settings
+import sys
 
+if sys.version_info < (2, 5, 0):
+    module = 'pysqlite2'
+else:
+    module = 'sqlite3'
+if hasattr(settings, 'DATABASE_OPTIONS'):
+    module = settings.DATABASE_OPTIONS.get('module', module)
 try:
-    try:
-        from sqlite3 import dbapi2 as Database
-    except ImportError, e1:
-        from pysqlite2 import dbapi2 as Database
+    __import__(module + '.dbapi2')
+    Database = sys.modules[module + '.dbapi2']
 except ImportError, exc:
-    import sys
     from django.core.exceptions import ImproperlyConfigured
-    if sys.version_info < (2, 5, 0):
-        module = 'pysqlite2'
-    else:
-        module = 'sqlite3'
-        exc = e1
     raise ImproperlyConfigured, "Error loading %s module: %s" % (module, exc)
 
 try:
@@ -163 +163 @@
                 'database': settings.DATABASE_NAME,
                 'detect_types': Database.PARSE_DECLTYPES | Database.PARSE_COLNAMES,
             }
+            self.options.pop('module', None)
             kwargs.update(self.options)
             self.connection = Database.connect(**kwargs)
             # Register extract, date_trunc, and regexp functions.