diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2009-02-03 22:10:46 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2009-02-03 22:10:46 +0000 |
| commit | b0fd405c28cea9edb1a91416b540eed3eba0bfac (patch) | |
| tree | 4ef20f45cfa709939a465d28936cb9def5de0791 | |
| parent | 962f0dbd7773a871f7a6a39ad28123249ec5586b (diff) | |
[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
| -rw-r--r-- | django/db/backends/oracle/base.py | 6 |
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, |