Fixed #10125: fixed the Oracle dsn construction code that was broken in [9712].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
81ae2afdec
commit
e3d64c6fca
|
@ -253,9 +253,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||
if len(settings.DATABASE_HOST.strip()) == 0:
|
||||
settings.DATABASE_HOST = 'localhost'
|
||||
if len(settings.DATABASE_PORT.strip()) != 0:
|
||||
dsn = '%s:%s/%s' % (settings.DATABASE_HOST,
|
||||
settings.DATABASE_PORT,
|
||||
settings.DATABASE_NAME)
|
||||
dsn = Database.makedsn(settings.DATABASE_HOST,
|
||||
int(settings.DATABASE_PORT),
|
||||
settings.DATABASE_NAME)
|
||||
else:
|
||||
dsn = settings.DATABASE_NAME
|
||||
return "%s/%s@%s" % (settings.DATABASE_USER,
|
||||
|
|
Loading…
Reference in New Issue