diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/db/backends/oracle/client.py --- a/app/django/db/backends/oracle/client.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/db/backends/oracle/client.py Tue Oct 14 16:00:59 2008 +0000 @@ -1,11 +1,15 @@ +from django.db.backends import BaseDatabaseClient from django.conf import settings import os -def runshell(): - dsn = settings.DATABASE_USER - if settings.DATABASE_PASSWORD: - dsn += "/%s" % settings.DATABASE_PASSWORD - if settings.DATABASE_NAME: - dsn += "@%s" % settings.DATABASE_NAME - args = ["sqlplus", "-L", dsn] - os.execvp("sqlplus", args) +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] + os.execvp(self.executable_name, args)