fix broken MySQL quoting

This commit is contained in:
Jan Dittberner 2015-01-01 23:14:37 +01:00
parent 4ed81c29e6
commit 2a638481d1

View file

@ -105,14 +105,12 @@ def create_mysql_database(dbname, username):
curs = conn.cursor() curs = conn.cursor()
curs.execute( curs.execute(
""" """
CREATE DATABASE %(dbname)s CHARACTER SET utf8 COLLATE utf8_german_ci CREATE DATABASE `%(dbname)s` CHARACTER SET utf8 COLLATE utf8_german_ci
""", """ % {'dbname': dbname})
{'dbname': dbname})
curs.execute( curs.execute(
""" """
GRANT ALL PRIVILEGES ON %(dbname)s.* TO %(username)s@'%%' GRANT ALL PRIVILEGES ON `%(dbname)s`.* TO %%(username)s@'%%%%'
""", """ % {'dbname': dbname}, {'username': username})
{'dbname': dbname, 'username': username})
conn.commit() conn.commit()
return dbname return dbname
@ -133,8 +131,7 @@ def delete_mysql_database(dbname, username):
curs = conn.cursor() curs = conn.cursor()
curs.execute( curs.execute(
""" """
REVOKE ALL PRIVILEGES ON %(dbname)s.* FROM %(username)s@'%%' REVOKE ALL PRIVILEGES ON `%(dbname)s`.* FROM %%(username)s@'%%%%'
""", """ % {'dbname': dbname}, {'username': username})
{'dbname': dbname, 'username': username})
conn.commit() conn.commit()
return True return True