diff options
| author | Nick Pope <nick@nickpope.me.uk> | 2021-05-10 21:32:10 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-05-12 12:21:57 +0200 |
| commit | 1061f5243646b4c9b8a758f8a36c9e2ccdded1cf (patch) | |
| tree | 8e28055d02a8a37a6c73abcbc0ac26526584c06b /tests/dbshell | |
| parent | d06c5b358149c02a62da8a5469264d05f29ac659 (diff) | |
| download | django-1061f5243646b4c9b8a758f8a36c9e2ccdded1cf.tar.gz | |
Fixed #32732 -- Removed usage of deprecated 'db' and 'passwd' connection options in MySQL backend.
The 'db' and 'passwd' connection options have been deprecated, use
'database' and 'password' instead (available since mysqlclient >= 1.3.8).
This also allows the 'database' option in DATABASES['OPTIONS'] on MySQL.
Diffstat (limited to 'tests/dbshell')
| -rw-r--r-- | tests/dbshell/test_mysql.py | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/tests/dbshell/test_mysql.py b/tests/dbshell/test_mysql.py index c3ecc6503b..b1e8e8a5c9 100644 --- a/tests/dbshell/test_mysql.py +++ b/tests/dbshell/test_mysql.py @@ -50,41 +50,49 @@ class MySqlDbshellCommandTestCase(SimpleTestCase): 'optiondbname', ] expected_env = {'MYSQL_PWD': 'optionpassword'} - self.assertEqual( - self.settings_to_cmd_args_env({ - 'NAME': 'settingdbname', - 'USER': 'settinguser', - 'PASSWORD': 'settingpassword', - 'HOST': 'settinghost', - 'PORT': settings_port, - 'OPTIONS': { - 'db': 'optiondbname', - 'user': 'optionuser', - 'passwd': 'optionpassword', - 'host': 'optionhost', - 'port': options_port, - }, - }), - (expected_args, expected_env), - ) + for keys in [('database', 'password'), ('db', 'passwd')]: + with self.subTest(keys=keys): + database, password = keys + self.assertEqual( + self.settings_to_cmd_args_env({ + 'NAME': 'settingdbname', + 'USER': 'settinguser', + 'PASSWORD': 'settingpassword', + 'HOST': 'settinghost', + 'PORT': settings_port, + 'OPTIONS': { + database: 'optiondbname', + 'user': 'optionuser', + password: 'optionpassword', + 'host': 'optionhost', + 'port': options_port, + }, + }), + (expected_args, expected_env), + ) - def test_options_password(self): + def test_options_non_deprecated_keys_preferred(self): expected_args = [ 'mysql', '--user=someuser', '--host=somehost', '--port=444', - 'somedbname', + 'optiondbname', ] expected_env = {'MYSQL_PWD': 'optionpassword'} self.assertEqual( self.settings_to_cmd_args_env({ - 'NAME': 'somedbname', + 'NAME': 'settingdbname', 'USER': 'someuser', 'PASSWORD': 'settingpassword', 'HOST': 'somehost', 'PORT': 444, - 'OPTIONS': {'password': 'optionpassword'}, + 'OPTIONS': { + 'database': 'optiondbname', + 'db': 'deprecatedoptiondbname', + 'password': 'optionpassword', + 'passwd': 'deprecatedoptionpassword', + }, }), (expected_args, expected_env), ) |