Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[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
  • Loading branch information...
commit b0fd405c28cea9edb1a91416b540eed3eba0bfac 1 parent 962f0db
Ian Kelly ikelly authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/db/backends/oracle/base.py
6 django/db/backends/oracle/base.py
View
@@ -253,9 +253,9 @@ def _connect_string(self, settings):
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,
Please sign in to comment.
Something went wrong with that request. Please try again.