From be61c65b0537181b4eb4de4c0db182e29a8d20b9 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Tue, 16 May 2023 15:54:36 +0200 Subject: [PATCH] only use the "database" connection argument with driver versions where "db" is deprecated/removed --- plugins/module_utils/mysql.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/module_utils/mysql.py b/plugins/module_utils/mysql.py index 6aeebe5..af026f3 100644 --- a/plugins/module_utils/mysql.py +++ b/plugins/module_utils/mysql.py @@ -143,9 +143,17 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='', if _mysql_cursor_param == 'cursor': # In case of PyMySQL driver: + if mysql_driver.version_info[0] < 1: + # for PyMySQL < 1.0.0, use 'db' instead of 'database' + config['db'] = config['database'] + del config['database'] db_connection = mysql_driver.connect(autocommit=autocommit, **config) else: # In case of MySQLdb driver + if mysql_driver.version_info[0] < 2 or mysql_driver.version_info[1] < 1: + # for MySQLdb < 2.1.0, use 'db' instead of 'database' + config['db'] = config['database'] + del config['database'] db_connection = mysql_driver.connect(**config) if autocommit: db_connection.autocommit(True)