mirror of
https://github.com/django/django.git
synced 2024-12-25 10:35:48 +00:00
Fixed small multi-db compatibility issue in the Oracle backend.
Also, converted a couple of constructs to a more Python idiomatic form. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
f91b41fe33
commit
4fb1825e75
@ -332,11 +332,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
||||
'istartswith': "LIKE UPPER(TRANSLATE(%s USING NCHAR_CS)) ESCAPE TRANSLATE('\\' USING NCHAR_CS)",
|
||||
'iendswith': "LIKE UPPER(TRANSLATE(%s USING NCHAR_CS)) ESCAPE TRANSLATE('\\' USING NCHAR_CS)",
|
||||
}
|
||||
oracle_version = None
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(DatabaseWrapper, self).__init__(*args, **kwargs)
|
||||
|
||||
self.oracle_version = None
|
||||
self.features = DatabaseFeatures(self)
|
||||
self.ops = DatabaseOperations()
|
||||
self.client = DatabaseClient(self)
|
||||
@ -349,9 +349,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
||||
|
||||
def _connect_string(self):
|
||||
settings_dict = self.settings_dict
|
||||
if len(settings_dict['HOST'].strip()) == 0:
|
||||
if settings_dict['HOST'].strip():
|
||||
settings_dict['HOST'] = 'localhost'
|
||||
if len(settings_dict['PORT'].strip()) != 0:
|
||||
if settings_dict['PORT'].strip():
|
||||
dsn = Database.makedsn(settings_dict['HOST'],
|
||||
int(settings_dict['PORT']),
|
||||
settings_dict['NAME'])
|
||||
|
Loading…
Reference in New Issue
Block a user