openstack/aodh
Code Issues Proposed changes

Merge "Issue one SQL statement per execute() call"

Browse Source
This commit is contained in:
Jenkins 2014-08-14 03:50:26 +00:00 committed by Gerrit Code Review
commit 6a19c940fb
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ceilometer/storage/sqlalchemy/migrate_repo/versions/003_set_utf8_charset.py
View File

@ -18,14 +18,15 @@ def upgrade(migrate_engine):
if migrate_engine.name == "mysql":
tables = ['meter', 'user', 'resource', 'project', 'source',
'sourceassoc']
sql = "SET foreign_key_checks = 0;"
migrate_engine.execute("SET foreign_key_checks = 0")
for table in tables:
sql += "ALTER TABLE %s CONVERT TO CHARACTER SET utf8;" % table
sql += "SET foreign_key_checks = 1;"
sql += ("ALTER DATABASE %s DEFAULT CHARACTER SET utf8;" %
migrate_engine.execute(
"ALTER TABLE %s CONVERT TO CHARACTER SET utf8" % table)
migrate_engine.execute("SET foreign_key_checks = 1")
migrate_engine.execute(
"ALTER DATABASE %s DEFAULT CHARACTER SET utf8" %
migrate_engine.url.database)
migrate_engine.execute(sql)
def downgrade(migrate_engine):
@ -33,11 +34,12 @@ def downgrade(migrate_engine):
if migrate_engine.name == "mysql":
tables = ['meter', 'user', 'resource', 'project', 'source',
'sourceassoc']
sql = "SET foreign_key_checks = 0;"
migrate_engine.execute("SET foreign_key_checks = 0")
for table in tables:
sql += "ALTER TABLE %s CONVERT TO CHARACTER SET latin1;" % table
sql += "SET foreign_key_checks = 1;"
sql += ("ALTER DATABASE %s DEFAULT CHARACTER SET latin1;" %
migrate_engine.execute(
"ALTER TABLE %s CONVERT TO CHARACTER SET latin1" % table)
migrate_engine.execute("SET foreign_key_checks = 1")
migrate_engine.execute(
"ALTER DATABASE %s DEFAULT CHARACTER SET latin1" %
migrate_engine.url.database)
migrate_engine.execute(sql)