mirror of
https://github.com/django/django.git
synced 2025-07-20 01:29:11 +00:00
[1.0.X] Fixed #10125: fixed the Oracle dsn construction code that was broken in [9712]. Backport of [9812] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
962f0dbd77
commit
b0fd405c28
@ -253,8 +253,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
|
|||||||
if len(settings.DATABASE_HOST.strip()) == 0:
|
if len(settings.DATABASE_HOST.strip()) == 0:
|
||||||
settings.DATABASE_HOST = 'localhost'
|
settings.DATABASE_HOST = 'localhost'
|
||||||
if len(settings.DATABASE_PORT.strip()) != 0:
|
if len(settings.DATABASE_PORT.strip()) != 0:
|
||||||
dsn = '%s:%s/%s' % (settings.DATABASE_HOST,
|
dsn = Database.makedsn(settings.DATABASE_HOST,
|
||||||
settings.DATABASE_PORT,
|
int(settings.DATABASE_PORT),
|
||||||
settings.DATABASE_NAME)
|
settings.DATABASE_NAME)
|
||||||
else:
|
else:
|
||||||
dsn = settings.DATABASE_NAME
|
dsn = settings.DATABASE_NAME
|
||||||
|
Loading…
x
Reference in New Issue
Block a user