Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 4fb1825e75999e16027bda73d905d815326bec84 1 parent f91b41f
@ramiro ramiro authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/db/backends/oracle/base.py
View
6 django/db/backends/oracle/base.py
@@ -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 @@ def _valid_connection(self):
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'])
Please sign in to comment.
Something went wrong with that request. Please try again.