p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Ian Kelly 2009-02-03 22:08:57 +00:00
parent 81ae2afdec
commit e3d64c6fca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/oracle/base.py
View File

@ -253,9 +253,9 @@ 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
return "%s/%s@%s" % (settings.DATABASE_USER, return "%s/%s@%s" % (settings.DATABASE_USER,