diff options
| author | Graham Hayes <gr@ham.ie> | 2018-01-05 14:03:53 +0000 |
|---|---|---|
| committer | Graham Hayes <gr@ham.ie> | 2018-01-05 16:28:41 +0000 |
| commit | c1a77a3ae00a04e564a2cc3f332f9a4c764584b5 (patch) | |
| tree | 9b9906ac96ccf7330b80913fd20e474a5eb45ab9 | |
| parent | 53d6dc069e98d3ed1514b00681b7b52a6bccbeea (diff) | |
| download | designate-c1a77a3ae00a04e564a2cc3f332f9a4c764584b5.tar.gz | |
PyMySQL 0.8.0 compat fix
In PyMySQL the "MULTI_STATEMENT" flag has been disabled
by default. (see PyMySQL/PyMySQL#590 )
Migration 98 had a single string with multiple statements
ran in a single execution.
Moving this to multiple executions of the same statements
allows the migration to succeed with the new behaviour.
Caused-By: PyMySQL/PyMySQL@c0aa3179406571592d3beb9d5a35badc4047cb79
Change-Id: I5f6d92f695c4c5830b8595b0cecbbafb426470a1
| -rw-r--r-- | designate/storage/impl_sqlalchemy/migrate_repo/versions/098_fix_service_charset.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/098_fix_service_charset.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/098_fix_service_charset.py index c5bff963..14f47c2d 100644 --- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/098_fix_service_charset.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/098_fix_service_charset.py @@ -25,9 +25,10 @@ def upgrade(migrate_engine): if migrate_engine.name != "mysql": return - sql = """SET foreign_key_checks = 0; - ALTER TABLE service_statuses CONVERT TO CHARACTER SET utf8; - SET foreign_key_checks = 1; - ALTER DATABASE %s DEFAULT CHARACTER SET utf8; - """ % migrate_engine.url.database - migrate_engine.execute(sql) + migrate_engine.execute("SET foreign_key_checks = 0;") + migrate_engine.execute( + "ALTER TABLE service_statuses CONVERT TO CHARACTER SET utf8;") + migrate_engine.execute("SET foreign_key_checks = 1;") + migrate_engine.execute( + "ALTER DATABASE %s DEFAULT CHARACTER SET utf8;" + % migrate_engine.url.database) |