openstack/aodh
Code Issues Proposed changes

Merge "Fix failed downgrade in migrations"

Browse Source
This commit is contained in:
Jenkins 2013-09-25 16:32:41 +00:00 committed by Gerrit Code Review
commit 795bf2b5b2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/storage/sqlalchemy/migrate_repo/versions/013_rename_counter_to_meter_alarm.py
View File

@ -18,16 +18,16 @@
from sqlalchemy import MetaData, Table from sqlalchemy import MetaData, Table
meta = MetaData()
def upgrade(migrate_engine): def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine meta.bind = migrate_engine
alarm = Table('alarm', meta, autoload=True) alarm = Table('alarm', meta, autoload=True)
alarm.c.counter_name.alter(name='meter_name') alarm.c.counter_name.alter(name='meter_name')
def downgrade(migrate_engine): def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine meta.bind = migrate_engine
alarm = Table('alarm', meta, autoload=True) alarm = Table('alarm', meta, autoload=True)
alarm.c.meter_name.alter(name='counter_name') alarm.c.meter_name.alter(name='counter_name')

4
ceilometer/storage/sqlalchemy/migrate_repo/versions/014_add_event_message_id.py
View File

@ -53,10 +53,8 @@ def downgrade(migrate_engine):
meta = sqlalchemy.MetaData(bind=migrate_engine) meta = sqlalchemy.MetaData(bind=migrate_engine)
event = sqlalchemy.Table('event', meta, autoload=True) event = sqlalchemy.Table('event', meta, autoload=True)
message_id = sqlalchemy.Column('message_id', sqlalchemy.String(50)) message_id = sqlalchemy.Column('message_id', sqlalchemy.String(50))
event.drop_column(message_id)
cons = UniqueConstraint('message_id', table=event) cons = UniqueConstraint('message_id', table=event)
cons.drop() cons.drop()
index = sqlalchemy.Index('idx_event_message_id', models.Event.message_id) index = sqlalchemy.Index('idx_event_message_id', models.Event.message_id)
index.drop(bind=migrate_engine) index.drop(bind=migrate_engine)
event.drop_column(message_id)