From 9fa59c9407ae3a2b406c5c4df17f2001dce966e2 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Wed, 15 Nov 2017 12:42:49 +0000
Subject: [PATCH] Fix merge conflict

---
 .../versions/0137_sms_sender_nullable.py      | 51 -------------------
 .../versions/0138_sms_sender_nullable.py      | 35 +++++++++++++
 2 files changed, 35 insertions(+), 51 deletions(-)
 delete mode 100644 migrations/versions/0137_sms_sender_nullable.py
 create mode 100644 migrations/versions/0138_sms_sender_nullable.py

diff --git a/migrations/versions/0137_sms_sender_nullable.py b/migrations/versions/0137_sms_sender_nullable.py
deleted file mode 100644
index 93e8e01a2..000000000
--- a/migrations/versions/0137_sms_sender_nullable.py
+++ /dev/null
@@ -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 ###
diff --git a/migrations/versions/0138_sms_sender_nullable.py b/migrations/versions/0138_sms_sender_nullable.py
new file mode 100644
index 000000000..37a21eed3
--- /dev/null
+++ b/migrations/versions/0138_sms_sender_nullable.py
@@ -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 ###