darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Rebecca Law
2017-11-15 12:42:49 +00:00
parent fd217e67f5
commit 9fa59c9407
2 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
migrations/versions/0137_sms_sender_nullable.py
View File

@@ -1,51 +0,0 @@
"""
Revision ID: 0137_sms_sender_nullable
Revises: 0136_user_mobile_nullable
Create Date: 2017-11-06 15:44:59.471977
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
revision = '0137_sms_sender_nullable'
down_revision = '0136_user_mobile_nullable'
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('notification_statistics')
op.alter_column('services', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=True)
op.alter_column('services_history', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=True)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('services_history', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=False)
op.alter_column('services', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=False)
op.create_table('notification_statistics',
sa.Column('id', postgresql.UUID(), autoincrement=False, nullable=False),
sa.Column('service_id', postgresql.UUID(), autoincrement=False, nullable=False),
sa.Column('emails_requested', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('emails_delivered', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('emails_failed', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('sms_requested', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('sms_delivered', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('sms_failed', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('day', sa.DATE(), autoincrement=False, nullable=False),
sa.ForeignKeyConstraint(['service_id'], ['services.id'],
name='notification_statistics_service_id_fkey'),
sa.PrimaryKeyConstraint('id', name='notification_statistics_pkey'),
sa.UniqueConstraint('service_id', 'day', name='uix_service_to_day')
)
# ### end Alembic commands ###

35
migrations/versions/0138_sms_sender_nullable.py Normal file
View File

@@ -0,0 +1,35 @@
"""
Revision ID: 0138_sms_sender_nullable
Revises: 0137_notification_template_hist
Create Date: 2017-11-06 15:44:59.471977
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
revision = '0138_sms_sender_nullable'
down_revision = '0137_notification_template_hist'
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('services', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=True)
op.alter_column('services_history', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=True)
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column('services_history', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=False)
op.alter_column('services', 'sms_sender',
existing_type=sa.VARCHAR(length=11),
nullable=False)
# ### end Alembic commands ###