diff --git a/plugins/module_utils/mysql.py b/plugins/module_utils/mysql.py index 6af7800..af67e92 100644 --- a/plugins/module_utils/mysql.py +++ b/plugins/module_utils/mysql.py @@ -84,7 +84,7 @@ def mysql_connect(module, login_user=None, login_password=None, config_file='', config['ssl']['check_hostname'] = check_hostname db_connection = mysql_driver.connect(autocommit=autocommit, **config) - + # Monkey patch the Connection class to close the connection when garbage collected def _conn_patch(conn_self): conn_self.close() diff --git a/plugins/modules/mysql_db.py b/plugins/modules/mysql_db.py index 85ce919..8c0a93d 100644 --- a/plugins/modules/mysql_db.py +++ b/plugins/modules/mysql_db.py @@ -343,7 +343,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.mysql.plugins.module_utils.database import mysql_quote_identifier -from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_driver, mysql_common_argument_spec +from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_common_argument_spec from ansible.module_utils.six.moves import shlex_quote from ansible.module_utils._text import to_native diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py index 4152d31..a7ff654 100644 --- a/plugins/modules/mysql_info.py +++ b/plugins/modules/mysql_info.py @@ -276,7 +276,6 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.mysql.plugins.module_utils.mysql import ( mysql_connect, mysql_common_argument_spec, - mysql_driver, get_server_implementation, ) diff --git a/plugins/modules/mysql_role.py b/plugins/modules/mysql_role.py index ae984ed..65ed673 100644 --- a/plugins/modules/mysql_role.py +++ b/plugins/modules/mysql_role.py @@ -304,7 +304,6 @@ RETURN = '''#''' from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.mysql.plugins.module_utils.mysql import ( mysql_connect, - mysql_driver, mysql_common_argument_spec ) from ansible_collections.community.mysql.plugins.module_utils.user import ( diff --git a/plugins/modules/mysql_variables.py b/plugins/modules/mysql_variables.py index 3cc9036..fcec26b 100644 --- a/plugins/modules/mysql_variables.py +++ b/plugins/modules/mysql_variables.py @@ -86,12 +86,11 @@ queries: ''' import os -import warnings from re import match from ansible.module_utils.basic import AnsibleModule from ansible_collections.community.mysql.plugins.module_utils.database import SQLParseError, mysql_quote_identifier -from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_driver, mysql_common_argument_spec +from ansible_collections.community.mysql.plugins.module_utils.mysql import mysql_connect, mysql_common_argument_spec from ansible.module_utils._text import to_native executed_queries = []