summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-12-22 14:50:36 -0500
committerDan Prince <dan.prince@rackspace.com>2011-12-22 14:50:36 -0500
commit2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e (patch)
tree303bd856e924903232d1c6e52905a5fa2d303486 /nova
parent640e632988c33511a2ac7043500ace60aac2eaea (diff)
downloadnova-2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e.tar.gz
nova-2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e.tar.xz
nova-2fcbe7e3ab4925ed627bc0e32676e2b6ff98ff3e.zip
Remove code in migration 064 to drop an fkey that does not exist.
Fixes LP bug #907878. Change-Id: I2e33fe3a58a34c9606b24eafc319afa9fd9a5d86
Diffstat (limited to 'nova')
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py12
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()