Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

db: Gave each DatabaseClient class an 'executable_name' attribute (e.…

…g., 'psql' or 'mysql'), so that we can use it to make a more helpful error message. Refs #8978

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 42a878cfeadf00f036a6110941550505d4d007af 1 parent 8f78d7f
@adrianholovaty adrianholovaty authored
View
8 django/db/backends/__init__.py
@@ -439,9 +439,13 @@ def sequence_list(self):
class BaseDatabaseClient(object):
"""
- This class encapsualtes all backend-specific methods for opening a
- client shell
+ This class encapsulates all backend-specific methods for opening a
+ client shell.
"""
+ # This should be a string representing the name of the executable
+ # (e.g., "psql"). Subclasses must override this.
+ executable_name = None
+
def runshell(self):
raise NotImplementedError()
View
6 django/db/backends/mysql/client.py
@@ -3,6 +3,8 @@
import os
class DatabaseClient(BaseDatabaseClient):
+ executable_name = 'mysql'
+
def runshell(self):
args = ['']
db = settings.DATABASE_OPTIONS.get('db', settings.DATABASE_NAME)
@@ -11,7 +13,7 @@ def runshell(self):
host = settings.DATABASE_OPTIONS.get('host', settings.DATABASE_HOST)
port = settings.DATABASE_OPTIONS.get('port', settings.DATABASE_PORT)
defaults_file = settings.DATABASE_OPTIONS.get('read_default_file')
- # Seems to be no good way to set sql_mode with CLI
+ # Seems to be no good way to set sql_mode with CLI.
if defaults_file:
args += ["--defaults-file=%s" % defaults_file]
@@ -26,4 +28,4 @@ def runshell(self):
if db:
args += [db]
- os.execvp('mysql', args)
+ os.execvp(self.executable_name, args)
View
6 django/db/backends/oracle/client.py
@@ -3,11 +3,13 @@
import os
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 = ["sqlplus", "-L", dsn]
- os.execvp("sqlplus", args)
+ args = [self.executable_name, "-L", dsn]
+ os.execvp(self.executable_name, args)
View
6 django/db/backends/postgresql/client.py
@@ -3,8 +3,10 @@
import os
class DatabaseClient(BaseDatabaseClient):
+ executable_name = 'psql'
+
def runshell(self):
- args = ['psql']
+ args = [self.executable_name]
if settings.DATABASE_USER:
args += ["-U", settings.DATABASE_USER]
if settings.DATABASE_PASSWORD:
@@ -14,4 +16,4 @@ def runshell(self):
if settings.DATABASE_PORT:
args.extend(["-p", str(settings.DATABASE_PORT)])
args += [settings.DATABASE_NAME]
- os.execvp('psql', args)
+ os.execvp(self.executable_name, args)
View
4 django/db/backends/sqlite3/client.py
@@ -3,6 +3,8 @@
import os
class DatabaseClient(BaseDatabaseClient):
+ executable_name = 'sqlite3'
+
def runshell(self):
args = ['', settings.DATABASE_NAME]
- os.execvp('sqlite3', args)
+ os.execvp(self.executable_name, args)
Please sign in to comment.
Something went wrong with that request. Please try again.