summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Kelly <ian.g.kelly@gmail.com>2009-02-03 22:08:57 +0000
committerIan Kelly <ian.g.kelly@gmail.com>2009-02-03 22:08:57 +0000
commite3d64c6fca04dc8df1b6fdb8809d4d15d7f27740 (patch)
treef1fcf975c19998f319cee0e627cbaf6d0e90ade1
parent81ae2afdec8a81b94bacf02a1242277e0b4caceb (diff)
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
-rw-r--r--django/db/backends/oracle/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 947f5ab949..38f51a707f 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -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,