ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-07-15 17:40:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

modules: add charset connection option

Browse source
This commit is contained in:
Andrew Klychkov 2021-04-13 07:34:18 +02:00
parent dad555a536
commit 915d125d70
7 changed files with 117 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/modules/mysql_query.py
View file

@ -148,6 +148,7 @@ def main():
check_hostname = module.params['check_hostname']
config_file = module.params['config_file']
query = module.params["query"]
charset = module.params["charset"]
if not isinstance(query, (str, list)):
module.fail_json(msg="the query option value must be a string or list, passed %s" % type(query))
@ -180,7 +181,8 @@ def main():
config_file, ssl_cert, ssl_key, ssl_ca, db,
check_hostname=check_hostname,
connect_timeout=connect_timeout,
cursor_class='DictCursor', autocommit=autocommit)
cursor_class='DictCursor', autocommit=autocommit,
charset=charset)
except Exception as e:
module.fail_json(msg="unable to connect to database, check login_user and "
"login_password are correct or %s has the credentials. "

4
plugins/modules/mysql_user.py
View file

@ -1161,6 +1161,8 @@ def main():
plugin_hash_string = module.params["plugin_hash_string"]
plugin_auth_string = module.params["plugin_auth_string"]
resource_limits = module.params["resource_limits"]
charset = module.params["charset"]
if priv and not isinstance(priv, (str, dict)):
module.fail_json(msg="priv parameter must be str or dict but %s was passed" % type(priv))
@ -1175,7 +1177,7 @@ def main():
if check_implicit_admin:
try:
cursor, db_conn = mysql_connect(module, "root", "", config_file, ssl_cert, ssl_key, ssl_ca, db,
connect_timeout=connect_timeout, check_hostname=check_hostname)
connect_timeout=connect_timeout, check_hostname=check_hostname, charset=charset)
except Exception:
pass