innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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:
Ramiro Morales 2010-11-11 05:07:32 +00:00
parent f91b41fe33
commit 4fb1825e75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/oracle/base.py
View File

@ -332,11 +332,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
'istartswith': "LIKE UPPER(TRANSLATE(%s USING NCHAR_CS)) ESCAPE TRANSLATE('\\' USING NCHAR_CS)", '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)", 'iendswith': "LIKE UPPER(TRANSLATE(%s USING NCHAR_CS)) ESCAPE TRANSLATE('\\' USING NCHAR_CS)",
} }
oracle_version = None
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(DatabaseWrapper, self).__init__(*args, **kwargs) super(DatabaseWrapper, self).__init__(*args, **kwargs)
self.oracle_version = None
self.features = DatabaseFeatures(self) self.features = DatabaseFeatures(self)
self.ops = DatabaseOperations() self.ops = DatabaseOperations()
self.client = DatabaseClient(self) self.client = DatabaseClient(self)
@ -349,9 +349,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
def _connect_string(self): def _connect_string(self):
settings_dict = self.settings_dict settings_dict = self.settings_dict
if len(settings_dict['HOST'].strip()) == 0: if settings_dict['HOST'].strip():
settings_dict['HOST'] = 'localhost' settings_dict['HOST'] = 'localhost'
if len(settings_dict['PORT'].strip()) != 0: if settings_dict['PORT'].strip():
dsn = Database.makedsn(settings_dict['HOST'], dsn = Database.makedsn(settings_dict['HOST'],
int(settings_dict['PORT']), int(settings_dict['PORT']),
settings_dict['NAME']) settings_dict['NAME'])