Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added hex-blob option for mysql_db module #23891

Merged
merged 1 commit into from
Oct 20, 2019
Merged

Added hex-blob option for mysql_db module #23891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions lib/ansible/modules/database/mysql/mysql_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@
required: false
default: []
version_added: "2.7"
hex_blob:
description:
- Dump binary columns using hexadecimal notation
required: false
default: false
type: bool
version_added: "2.10"
author: "Ansible Core Team"
requirements:
- mysql (command line binary)
Expand Down Expand Up @@ -184,7 +191,7 @@ def db_delete(cursor, db):


def db_dump(module, host, user, password, db_name, target, all_databases, port, config_file, socket=None, ssl_cert=None, ssl_key=None, ssl_ca=None,
single_transaction=None, quick=None, ignore_tables=None):
single_transaction=None, quick=None, ignore_tables=None, hex_blob=None):
cmd = module.get_bin_path('mysqldump', True)
# If defined, mysqldump demands --defaults-extra-file be the first option
if config_file:
Expand Down Expand Up @@ -214,6 +221,8 @@ def db_dump(module, host, user, password, db_name, target, all_databases, port,
if ignore_tables:
for an_ignored_table in ignore_tables:
cmd += " --ignore-table={0}".format(an_ignored_table)
if hex_blob:
cmd += " --hex-blob"

path = None
if os.path.splitext(target)[-1] == '.gz':
Expand Down Expand Up @@ -326,6 +335,7 @@ def main():
single_transaction=dict(type='bool', default=False),
quick=dict(type='bool', default=True),
ignore_tables=dict(type='list', default=[]),
hex_blob=dict(default=False, type='bool'),
),
supports_check_mode=True,
)
Expand Down Expand Up @@ -360,6 +370,7 @@ def main():
module.fail_json(msg="Name of ignored table cannot be empty")
single_transaction = module.params["single_transaction"]
quick = module.params["quick"]
hex_blob = module.params["hex_blob"]

if len(db) > 1 and state == 'import':
module.fail_json(msg="Multiple databases are not supported with state=import")
Expand Down Expand Up @@ -425,7 +436,7 @@ def main():
rc, stdout, stderr = db_dump(module, login_host, login_user,
login_password, db, target, all_databases,
login_port, config_file, socket, ssl_cert, ssl_key,
ssl_ca, single_transaction, quick, ignore_tables)
ssl_ca, single_transaction, quick, ignore_tables, hex_blob)
if rc != 0:
module.fail_json(msg="%s" % stderr)
module.exit_json(changed=True, db=db_name, db_list=db, msg=stdout)
Expand Down