Merge pull request #2788 from aquach/devel

Escape MySQL db names.
pull/2786/merge
Michael DeHaan 12 years ago
commit 47d3f238c0

@ -104,7 +104,7 @@ def db_exists(cursor, db):
return bool(res) return bool(res)
def db_delete(cursor, db): def db_delete(cursor, db):
query = "DROP DATABASE %s" % db query = "DROP DATABASE `%s`" % db
cursor.execute(query) cursor.execute(query)
return True return True
@ -125,7 +125,7 @@ def db_create(cursor, db, encoding, collation):
encoding = " CHARACTER SET %s" % encoding encoding = " CHARACTER SET %s" % encoding
if collation: if collation:
collation = " COLLATE %s" % collation collation = " COLLATE %s" % collation
query = "CREATE DATABASE %s%s%s" % (db, encoding, collation) query = "CREATE DATABASE `%s`%s%s" % (db, encoding, collation)
res = cursor.execute(query) res = cursor.execute(query)
return True return True

Loading…
Cancel
Save