Merge pull request #48164 from garethgreenaway/48146_mysql_output_to_file

[2018.3] Fixes to mysql state
This commit is contained in:
Nicole Thomas 2018-06-18 09:10:19 -04:00 committed by GitHub
commit 60c9490bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -353,9 +353,17 @@ def run(name,
)
)
else:
output_file.write(
salt.utils.stringutils.to_str(query_result)
)
if isinstance(query_result, six.text_type):
output_file.write(
salt.utils.stringutils.to_str(query_result)
)
else:
for col, val in six.iteritems(query_result):
output_file.write(
salt.utils.stringutils.to_str(
'{0}:{1}\n'.format(col, val)
)
)
else:
ret['changes']['query'] = "Executed"