Merge branch 'master' into hr

This commit is contained in:
Chris Hill-Scott
2017-12-13 10:28:17 +00:00
committed by GitHub
2 changed files with 28 additions and 1 deletions

View File

@@ -0,0 +1,24 @@
"""
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 = '0152_kill_service_free_fragments'
down_revision = '0151_refactor_letter_rates'
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))

View File

@@ -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))