diff options
author | Simon Charette <charette.s@gmail.com> | 2020-10-04 18:25:29 -0400 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-10-29 22:22:58 +0100 |
commit | bbe6fbb8768e8fb1aecb96d51c049d7ceaf802d3 (patch) | |
tree | 7c0e7ac6defc405cd5320066f75ade21bf9943ac /django/db/backends/mysql/client.py | |
parent | 4ac2d4fa42e1659f328c35b6b8d4761b3419c11a (diff) | |
download | django-bbe6fbb8768e8fb1aecb96d51c049d7ceaf802d3.tar.gz |
Refs #32061 -- Unified DatabaseClient.runshell() in db backends.
Diffstat (limited to 'django/db/backends/mysql/client.py')
-rw-r--r-- | django/db/backends/mysql/client.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py index a94d388ccd..79032c1207 100644 --- a/django/db/backends/mysql/client.py +++ b/django/db/backends/mysql/client.py @@ -1,5 +1,3 @@ -import subprocess - from django.db.backends.base.client import BaseDatabaseClient @@ -7,7 +5,7 @@ class DatabaseClient(BaseDatabaseClient): executable_name = 'mysql' @classmethod - def settings_to_cmd_args(cls, settings_dict, parameters): + def settings_to_cmd_args_env(cls, settings_dict, parameters): args = [cls.executable_name] db = settings_dict['OPTIONS'].get('db', settings_dict['NAME']) user = settings_dict['OPTIONS'].get('user', settings_dict['USER']) @@ -48,8 +46,4 @@ class DatabaseClient(BaseDatabaseClient): if db: args += [db] args.extend(parameters) - return args - - def runshell(self, parameters): - args = DatabaseClient.settings_to_cmd_args(self.connection.settings_dict, parameters) - subprocess.run(args, check=True) + return args, None |