[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:
Ian Kelly 2009-02-03 22:10:46 +00:00
parent 962f0dbd77
commit b0fd405c28
1 changed files with 3 additions and 3 deletions

View File

@ -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,