From 08b21bc0f4fa758c324ee58d613b326c3deba2af Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 1 Dec 2017 17:00:39 +0000 Subject: [PATCH 1/3] remove fragments from db --- .../0151_kill_service_free_fragments.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 migrations/versions/0151_kill_service_free_fragments.py diff --git a/migrations/versions/0151_kill_service_free_fragments.py b/migrations/versions/0151_kill_service_free_fragments.py new file mode 100644 index 000000000..ecc3c126d --- /dev/null +++ b/migrations/versions/0151_kill_service_free_fragments.py @@ -0,0 +1,24 @@ +""" + +Revision ID: 0151_kill_service_free_fragments +Revises: 0150_another_letter_org +Create Date: 2017-12-01 16:49:51.178455 + +""" +from alembic import op +import sqlalchemy as sa + +revision = '0151_kill_service_free_fragments' +down_revision = '0150_another_letter_org' + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('services', 'free_sms_fragment_limit') + op.drop_column('services_history', 'free_sms_fragment_limit') + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('services_history', sa.Column('free_sms_fragment_limit', sa.BIGINT(), autoincrement=False, nullable=True)) + op.add_column('services', sa.Column('free_sms_fragment_limit', sa.BIGINT(), autoincrement=False, nullable=True)) From da468681f236fcc4d19e4fdb7cd9f2f518d83d37 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 7 Dec 2017 10:41:10 +0000 Subject: [PATCH 2/3] add warning to fix_migrations script for when the filename is different --- scripts/fix_migrations.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/fix_migrations.py b/scripts/fix_migrations.py index 3965ed411..4bf07b7cb 100755 --- a/scripts/fix_migrations.py +++ b/scripts/fix_migrations.py @@ -46,8 +46,11 @@ def reorder_revisions(revisions, old_base, new_base): file_data = rev_file.read() file_data = file_data.replace(head.revision, new_revision_id).replace(old_base, new_base) + new_filename = head.path.replace(head.revision, new_revision_id) - with open(head.path.replace(head.revision, new_revision_id), 'w') as rev_file: + assert head.path != new_filename, 'Old filename not same as revision id, please rename file before continuing' + + with open(new_filename, 'w') as rev_file: rev_file.write(file_data) print("Removing {}".format(head.path)) From 689ece75a05ab16b9980fee840135a2dfcb86087 Mon Sep 17 00:00:00 2001 From: venusbb Date: Wed, 13 Dec 2017 10:03:40 +0000 Subject: [PATCH 3/3] db version change --- ...e_fragments.py => 0152_kill_service_free_fragments.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0151_kill_service_free_fragments.py => 0152_kill_service_free_fragments.py} (78%) diff --git a/migrations/versions/0151_kill_service_free_fragments.py b/migrations/versions/0152_kill_service_free_fragments.py similarity index 78% rename from migrations/versions/0151_kill_service_free_fragments.py rename to migrations/versions/0152_kill_service_free_fragments.py index ecc3c126d..038b978da 100644 --- a/migrations/versions/0151_kill_service_free_fragments.py +++ b/migrations/versions/0152_kill_service_free_fragments.py @@ -1,15 +1,15 @@ """ -Revision ID: 0151_kill_service_free_fragments -Revises: 0150_another_letter_org +Revision ID: 0152_kill_service_free_fragments +Revises: 0151_refactor_letter_rates Create Date: 2017-12-01 16:49:51.178455 """ from alembic import op import sqlalchemy as sa -revision = '0151_kill_service_free_fragments' -down_revision = '0150_another_letter_org' +revision = '0152_kill_service_free_fragments' +down_revision = '0151_refactor_letter_rates' def upgrade():