From b86d69f52920adf8e065bf6952ab6b3814211d4e Mon Sep 17 00:00:00 2001
From: Boulder Sprinters <boulder-sprinters@djangoproject.com>
Date: Fri, 30 Mar 2007 16:54:17 +0000
Subject: [PATCH] boulder-oracle-sprint: Fixed "manage.py dbshell" for Oracle
 so sqlplus is invoked correctly.

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/oracle/client.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py
index 7e32ebef2f..372783aa97 100644
--- a/django/db/backends/oracle/client.py
+++ b/django/db/backends/oracle/client.py
@@ -2,9 +2,10 @@ from django.conf import settings
 import os
 
 def runshell():
-    args = ''
-    args += settings.DATABASE_USER
+    dsn = settings.DATABASE_USER
     if settings.DATABASE_PASSWORD:
-        args += "/%s" % settings.DATABASE_PASSWORD
-    args += "@%s" % settings.DATABASE_NAME
-    os.execvp('sqlplus', args)
+        dsn += "/%s" % settings.DATABASE_PASSWORD
+    if settings.DATABASE_NAME:
+        dsn += "@%s" % settings.DATABASE_NAME
+    args = ["sqlplus", "-L", dsn]
+    os.execvp("sqlplus", args)