From e47b29a97492c0493d4e595547250e48993dfcef Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Fri, 29 Apr 2016 13:35:05 -0400 Subject: [PATCH] migration: add missing delete from down migration This also reorganizes the file a bit. --- .../a3ba52d02dec_initial_keyserver.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/data/migrations/versions/a3ba52d02dec_initial_keyserver.py b/data/migrations/versions/a3ba52d02dec_initial_keyserver.py index f8e38af8b..4e59ba1eb 100644 --- a/data/migrations/versions/a3ba52d02dec_initial_keyserver.py +++ b/data/migrations/versions/a3ba52d02dec_initial_keyserver.py @@ -25,12 +25,16 @@ def upgrade(tables): sa.Column('notes', UTF8LongText(), nullable=False), sa.PrimaryKeyConstraint('id', name=op.f('pk_servicekeyapproval')), ) + op.create_index('servicekeyapproval_approval_type', 'servicekeyapproval', ['approval_type'], unique=False) + op.create_index('servicekeyapproval_approver_id', 'servicekeyapproval', ['approver_id'], unique=False) + op.bulk_insert( tables.notificationkind, [{'name':'service_key_submitted'}], ) + op.bulk_insert(tables.logentrykind, [ {'name':'service_key_create'}, {'name':'service_key_approve'}, @@ -40,8 +44,7 @@ def upgrade(tables): {'name':'service_key_rotate'}, ]) - op.create_index('servicekeyapproval_approval_type', 'servicekeyapproval', ['approval_type'], unique=False) - op.create_index('servicekeyapproval_approver_id', 'servicekeyapproval', ['approver_id'], unique=False) + op.create_table( 'servicekey', sa.Column('id', sa.Integer(), nullable=False), @@ -58,15 +61,15 @@ def upgrade(tables): name=op.f('fk_servicekey_approval_id_servicekeyapproval')), sa.PrimaryKeyConstraint('id', name=op.f('pk_servicekey')), ) - op.create_index('servicekey_approval_id', 'servicekey', ['approval_id'], unique=False) op.create_index('servicekey_kid', 'servicekey', ['kid'], unique=True) op.create_index('servicekey_service', 'servicekey', ['service'], unique=False) + + op.add_column(u'notification', sa.Column('lookup_path', sa.String(length=255), nullable=True)) op.create_index('notification_lookup_path', 'notification', ['lookup_path'], unique=False) - def downgrade(tables): op.execute(tables.logentrykind.delete().where(tables.logentrykind.c.name == op.inline_literal('service_key_create'))) op.execute(tables.logentrykind.delete().where(tables.logentrykind.c.name == op.inline_literal('service_key_approve'))) @@ -75,6 +78,14 @@ def downgrade(tables): op.execute(tables.logentrykind.delete().where(tables.logentrykind.c.name == op.inline_literal('service_key_extend'))) op.execute(tables.logentrykind.delete().where(tables.logentrykind.c.name == op.inline_literal('service_key_rotate'))) + + op.execute(tables.notificationkind.delete().where(tables.notificationkind.c.name == op.inline_literal('service_key_submitted'))) + + op.drop_column(u'notification', 'lookup_path') + + op.drop_table('servicekey') + + op.drop_table('servicekeyapproval')