openstack/nova
Code Issues Proposed changes

Merge "Remove code in migration 064 to drop an fkey that does not exist. Fixes LP bug #907878."

Browse Source
This commit is contained in:
Jenkins
2011-12-22 21:16:27 +00:00
committed by Gerrit Code Review
parent 0214475d47 2fcbe7e3ab
commit ccfc7df82d
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py
View File

@@ -32,7 +32,6 @@ def _get_table(name):
def upgrade(migrate_engine): def upgrade(migrate_engine):
meta.bind = migrate_engine meta.bind = migrate_engine
dialect = migrate_engine.url.get_dialect().name
instance_actions = _get_table('instance_actions') instance_actions = _get_table('instance_actions')
instances = _get_table('instances') instances = _get_table('instances')
uuid_column = Column('instance_uuid', String(36), uuid_column = Column('instance_uuid', String(36),
@@ -50,17 +49,6 @@ def upgrade(migrate_engine):
uuid_column.drop() uuid_column.drop()
raise 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() instance_actions.c.instance_id.drop()