Removed code duplicated in SQLite3 and SpatiaLite GeoDjango DB backends.
Moved it to an auxiliary method in the SQLite3 backend cursor class. Did this to reduce the chances of us forgetting to port changes in DB connection setup process from the former to the latter one like it happened e.g. in r17205. Refs #17258. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
8a986cb5bc
commit
5a4e63e62a
|
@ -38,22 +38,7 @@ class DatabaseWrapper(SQLiteDatabaseWrapper):
|
|||
|
||||
def _cursor(self):
|
||||
if self.connection is None:
|
||||
## The following is the same as in django.db.backends.sqlite3.base ##
|
||||
settings_dict = self.settings_dict
|
||||
if not settings_dict['NAME']:
|
||||
raise ImproperlyConfigured("Please fill out the database NAME in the settings module before using the database.")
|
||||
kwargs = {
|
||||
'database': settings_dict['NAME'],
|
||||
'detect_types': Database.PARSE_DECLTYPES | Database.PARSE_COLNAMES,
|
||||
}
|
||||
kwargs.update(settings_dict['OPTIONS'])
|
||||
self.connection = Database.connect(**kwargs)
|
||||
# Register extract, date_trunc, and regexp functions.
|
||||
self.connection.create_function("django_extract", 2, _sqlite_extract)
|
||||
self.connection.create_function("django_date_trunc", 2, _sqlite_date_trunc)
|
||||
self.connection.create_function("regexp", 2, _sqlite_regexp)
|
||||
self.connection.create_function("django_format_dtdelta", 5, _sqlite_format_dtdelta)
|
||||
connection_created.send(sender=self.__class__, connection=self)
|
||||
self._sqlite_create_connection()
|
||||
|
||||
## From here on, customized for GeoDjango ##
|
||||
|
||||
|
|
|
@ -230,8 +230,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
self.introspection = DatabaseIntrospection(self)
|
||||
self.validation = BaseDatabaseValidation(self)
|
||||
|
||||
def _cursor(self):
|
||||
if self.connection is None:
|
||||
def _sqlite_create_connection(self):
|
||||
settings_dict = self.settings_dict
|
||||
if not settings_dict['NAME']:
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
@ -263,6 +262,10 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
self.connection.create_function("regexp", 2, _sqlite_regexp)
|
||||
self.connection.create_function("django_format_dtdelta", 5, _sqlite_format_dtdelta)
|
||||
connection_created.send(sender=self.__class__, connection=self)
|
||||
|
||||
def _cursor(self):
|
||||
if self.connection is None:
|
||||
self._sqlite_create_connection()
|
||||
return self.connection.cursor(factory=SQLiteCursorWrapper)
|
||||
|
||||
def check_constraints(self, table_names=None):
|
||||
|
|
Loading…
Reference in New Issue