From 2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 22 Dec 2011 14:50:36 -0500 Subject: [PATCH] Remove code in migration 064 to drop an fkey that does not exist. Fixes LP bug #907878. Change-Id: I2e33fe3a58a34c9606b24eafc319afa9fd9a5d86 --- ...change_instance_id_to_uuid_in_instance_actions.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py b/nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py index bc9519f1b6b8..1370efb559ab 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py @@ -32,7 +32,6 @@ def _get_table(name): def upgrade(migrate_engine): meta.bind = migrate_engine - dialect = migrate_engine.url.get_dialect().name instance_actions = _get_table('instance_actions') instances = _get_table('instances') uuid_column = Column('instance_uuid', String(36), @@ -50,17 +49,6 @@ def upgrade(migrate_engine): uuid_column.drop() raise - if not dialect.startswith('sqlite'): - try: - fkey_name = list(instance_actions.c.instance_id.foreign_keys)[0].\ - constraint.name - ForeignKeyConstraint(columns=[instance_actions.c.instance_id], - refcolumns=[instances.c.id], - name=fkey_name).drop() - except Exception: - logging.error(_("foreign key constraint couldn't be removed")) - raise - instance_actions.c.instance_id.drop()