cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

requested changes

Browse source
This commit is contained in:
Bruce Pennypacker 2015-01-08 21:41:15 +00:00 committed by Matt Clay
parent 9cbe3eb8ae
commit 605a5a5b53
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -317,10 +317,7 @@ def privileges_revoke(cursor, user,host,db_table,grant_option):
query = ["REVOKE ALL PRIVILEGES ON %s" % mysql_quote_identifier(db_table, 'table')] query = ["REVOKE ALL PRIVILEGES ON %s" % mysql_quote_identifier(db_table, 'table')]
query.append("FROM %s@%s") query.append("FROM %s@%s")
query = ' '.join(query) query = ' '.join(query)
try: cursor.execute(query, (user, host))
cursor.execute(query, (user, host))
except Exception, e:
raise Exception("%s. Query=\"%s\"" % (str(e), query % (user, host)))
def privileges_grant(cursor, user,host,db_table,priv): def privileges_grant(cursor, user,host,db_table,priv):
# Escape '%' since mysql db.execute uses a format string and the # Escape '%' since mysql db.execute uses a format string and the
@ -330,16 +327,11 @@ def privileges_grant(cursor, user,host,db_table,priv):
query = ["GRANT %s ON %s" % (priv_string, mysql_quote_identifier(db_table, 'table'))] query = ["GRANT %s ON %s" % (priv_string, mysql_quote_identifier(db_table, 'table'))]
query.append("TO %s@%s") query.append("TO %s@%s")
if 'GRANT' in priv: if 'GRANT' in priv:
query.append(" WITH GRANT OPTION") query.append("WITH GRANT OPTION")
if 'REQUIRESSL' in priv: if 'REQUIRESSL' in priv:
query.append(" REQUIRE SSL") query.append("REQUIRE SSL")
query = ' '.join(query) query = ' '.join(query)
try: cursor.execute(query, (user, host))
cursor.execute(query, (user, host))
except Exception, e:
raise Exception("%s. Query=\"%s\"" % (str(e), query % (user, host)))
def strip_quotes(s): def strip_quotes(s):
""" Remove surrounding single or double quotes """ Remove surrounding single or double quotes