diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-08 05:12:14 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-08 05:12:14 +0000 |
| commit | c20019a91d7d553606f45d21c513f277fb98deb4 (patch) | |
| tree | 599959a13adc0d18013c7aa1288d0933a5ba982c /django/db/backends/oracle/client.py | |
| parent | 300752bd6c0bfdf3bdf85e61fed318f4e587b16a (diff) | |
| download | django-c20019a91d7d553606f45d21c513f277fb98deb4.tar.gz | |
Fixed #9972: The dbshell command was ignoring the DATABASE_HOST and DATABASE_PORT settings in Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/backends/oracle/client.py')
| -rw-r--r-- | django/db/backends/oracle/client.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py index 52c4880e0e..c95b8109ba 100644 --- a/django/db/backends/oracle/client.py +++ b/django/db/backends/oracle/client.py @@ -6,10 +6,7 @@ class DatabaseClient(BaseDatabaseClient): executable_name = 'sqlplus' def runshell(self): - dsn = settings.DATABASE_USER - if settings.DATABASE_PASSWORD: - dsn += "/%s" % settings.DATABASE_PASSWORD - if settings.DATABASE_NAME: - dsn += "@%s" % settings.DATABASE_NAME - args = [self.executable_name, "-L", dsn] + from django.db import connection + conn_string = connection._connect_string(settings) + args = [self.executable_name, "-L", conn_string] os.execvp(self.executable_name, args) |