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

Making casting optional #10

Closed
wants to merge 1 commit into from
Closed

Making casting optional #10

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: 8 additions & 7 deletions library/mysql_query
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def change_required(cursor, table, identifiers, desired_values):

try:
res = cursor.execute(query)
except MySQLdb.ProgrammingError, e:
except MySQLdb.ProgrammingError as e:
(errcode, message) = e.args
if errcode == 1146:
return ERR_NO_SUCH_TABLE
Expand Down Expand Up @@ -141,7 +141,7 @@ def execute_action(cursor, action, table, identifier, values, defaults):
return update_record(cursor, table, identifier, values)
else:
return {'failed': True, 'msg': 'Internal Error: unknown action "%s" required' % action}
except Exception, e:
except Exception as e:
return {'failed': True, 'msg': 'updating/inserting the record failed due to "%s".' % str(e)}


Expand Down Expand Up @@ -200,21 +200,21 @@ def connect(connection, module):
try:
db_connection = MySQLdb.connect(**connection)
return db_connection
except Exception, e:
except Exception as e:
module.fail_json(msg="Error connecting to mysql database: %s" % str(e))


def extract_column_value_maps(parameter):
def extract_column_value_maps(parameter, cast_values=True):
"""
extract mysql-quoted tuple-lists for parameters given as ansible params
:param parameter:
:return:
"""

def cast_if_necessary(v):
if isinstance(v, int):
if isinstance(v, int) and cast_values:
return long(v)
if isinstance(v, str) and v.isdigit():
if isinstance(v, str) and v.isdigit() and cast_values:
return long(v)

return v
Expand All @@ -238,6 +238,7 @@ def main():
login_unix_socket=dict(default=None),
name=dict(required=True, aliases=['db']),
state=dict(default="present", choices=['absent', 'present']),
cast_values=dict(type='bool', required=False, default=True),

table=dict(required=True),

Expand All @@ -260,7 +261,7 @@ def main():
# mysql_quote all identifiers and get the parameters into shape
table = mysql_quote_identifier(module.params['table'], 'table')
identifiers = dict(extract_column_value_maps(module.params['identifiers']))
values = dict(extract_column_value_maps(module.params['values']))
values = dict(extract_column_value_maps(module.params['values'], module.params['cast_values']))
defaults = dict(extract_column_value_maps(module.params['defaults']))

exit_messages = {
Expand Down