Fixed #22646: Added support for the MySQL ssl-ca option to dbshell.

2 files changed, 73 insertions, 0 deletions

diff --git a/tests/dbshell/__init__.py b/tests/dbshell/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/dbshell/__init__.py
diff --git a/tests/dbshell/tests.py b/tests/dbshell/tests.py
new file mode 100644
index 0000000000..7efb97d9cb
--- /dev/null
+++ b/tests/dbshell/tests.py
@@ -0,0 +1,73 @@
+from django.db.backends.mysql.client import DatabaseClient
+from django.test import SimpleTestCase
+
+
+class MySqlDbshellCommandTestCase(SimpleTestCase):
+
+    def test_fails_with_keyerror_on_incomplete_config(self):
+        with self.assertRaises(KeyError):
+            self.get_command_line_arguments({})
+
+    def test_basic_params_specified_in_settings(self):
+        self.assertEqual(
+            ['mysql', '--user=someuser', '--password=somepassword',
+             '--host=somehost', '--port=444', 'somedbname'],
+            self.get_command_line_arguments({
+                'NAME': 'somedbname',
+                'USER': 'someuser',
+                'PASSWORD': 'somepassword',
+                'HOST': 'somehost',
+                'PORT': 444,
+                'OPTIONS': {},
+            }))
+
+    def test_options_override_settings_proper_values(self):
+        settings_port = 444
+        options_port = 555
+        self.assertNotEqual(settings_port, options_port, 'test pre-req')
+        self.assertEqual(
+            ['mysql', '--user=optionuser', '--password=optionpassword',
+             '--host=optionhost', '--port={}'.format(options_port), 'optiondbname'],
+            self.get_command_line_arguments({
+                'NAME': 'settingdbname',
+                'USER': 'settinguser',
+                'PASSWORD': 'settingpassword',
+                'HOST': 'settinghost',
+                'PORT': settings_port,
+                'OPTIONS': {
+                    'db': 'optiondbname',
+                    'user': 'optionuser',
+                    'passwd': 'optionpassword',
+                    'host': 'optionhost',
+                    'port': options_port,
+                },
+            }))
+
+    def test_can_connect_using_sockets(self):
+        self.assertEqual(
+            ['mysql', '--user=someuser', '--password=somepassword',
+             '--socket=/path/to/mysql.socket.file', 'somedbname'],
+            self.get_command_line_arguments({
+                'NAME': 'somedbname',
+                'USER': 'someuser',
+                'PASSWORD': 'somepassword',
+                'HOST': '/path/to/mysql.socket.file',
+                'PORT': None,
+                'OPTIONS': {},
+            }))
+
+    def test_ssl_certificate_is_added(self):
+        self.assertEqual(
+            ['mysql', '--user=someuser', '--password=somepassword',
+             '--host=somehost', '--port=444', '--ssl-ca=sslca', 'somedbname'],
+            self.get_command_line_arguments({
+                'NAME': 'somedbname',
+                'USER': 'someuser',
+                'PASSWORD': 'somepassword',
+                'HOST': 'somehost',
+                'PORT': 444,
+                'OPTIONS': {'ssl': {'ca': 'sslca'}},
+            }))
+
+    def get_command_line_arguments(self, connection_settings):
+        return DatabaseClient.settings_to_cmd_args(connection_settings)