diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2010-11-11 05:12:05 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2010-11-11 05:12:05 +0000 |
| commit | 2778f146604f33c4eab316ce6c8566a83b198ea8 (patch) | |
| tree | 113235e77ebd6c5823e88e700999312c6eb92837 | |
| parent | 0f065d346dc4814d42374c9069ef0e232f6d9b7b (diff) | |
[1.2.X] Fixed small multi-db compatibility issue in the Oracle backend.
Also, converted a couple of constructs to a more Python idiomatic form.
Backport of [14512] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/backends/oracle/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 919c862621..f4c9050a8d 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -329,11 +329,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.ops = DatabaseOperations() self.client = DatabaseClient(self) @@ -346,9 +346,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']) |