From 3b63c60a9e32578417b78a1379a870501f5c7671 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Wed, 17 May 2023 13:18:53 +0200 Subject: [PATCH] refactoring: use "get_connector_name" in "mysql_connect" --- plugins/module_utils/mysql.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/module_utils/mysql.py b/plugins/module_utils/mysql.py index 0a25c6c..713aba8 100644 --- a/plugins/module_utils/mysql.py +++ b/plugins/module_utils/mysql.py @@ -134,14 +134,14 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='', if connect_timeout is not None: config['connect_timeout'] = connect_timeout if check_hostname is not None: - if mysql_driver.__name__ == "pymysql": + if get_connector_name(mysql_driver) == 'pymysql': version_tuple = (n for n in mysql_driver.__version__.split('.') if n != 'None') if reduce(lambda x, y: int(x) * 100 + int(y), version_tuple) >= 711: config['ssl']['check_hostname'] = check_hostname else: module.fail_json(msg='To use check_hostname, pymysql >= 0.7.11 is required on the target host') - if _mysql_cursor_param == 'cursor': + if get_connector_name(mysql_driver) == 'pymysql': # In case of PyMySQL driver: if mysql_driver.version_info[0] < 1: # for PyMySQL < 1.0.0, use 'db' instead of 'database' and 'passwd' instead of 'password'