diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-22 21:16:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-22 21:16:27 +0000 |
| commit | ccfc7df82d934e894c604e6cc48eb12867a7c7a7 (patch) | |
| tree | 50e713cce113c2ca449d3ebf86e5a8e48c650064 | |
| parent | 0214475d47b3aab3631d89bf035ec4b7b3cb3457 (diff) | |
| parent | 2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e (diff) | |
| download | nova-ccfc7df82d934e894c604e6cc48eb12867a7c7a7.tar.gz nova-ccfc7df82d934e894c604e6cc48eb12867a7c7a7.tar.xz nova-ccfc7df82d934e894c604e6cc48eb12867a7c7a7.zip | |
Merge "Remove code in migration 064 to drop an fkey that does not exist. Fixes LP bug #907878."
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py | 12 |
1 files changed, 0 insertions, 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 bc9519f1b..1370efb55 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() |