saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Accounting for certain situations when the query result is not a string, but actually a dictionary.

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-06-15 14:56:33 -07:00
parent 152c09cc0c
commit a040643a82
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/states/mysql_query.py
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"