From 1f0f47a8dec7c4639970386a0cb179596921b4a3 Mon Sep 17 00:00:00 2001
From: Allen Short <ashort@mozilla.com>
Date: Wed, 14 Feb 2018 17:52:43 +0000
Subject: [PATCH] merge upstream db changes

---
 migrations/versions/15041b7085fe_.py | 24 ++++++++++++++++++++++++
 migrations/versions/f9571a5ab4f3_.py | 28 ----------------------------
 2 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 migrations/versions/15041b7085fe_.py
 delete mode 100644 migrations/versions/f9571a5ab4f3_.py

diff --git a/migrations/versions/15041b7085fe_.py b/migrations/versions/15041b7085fe_.py
new file mode 100644
index 0000000000..c75aa86a55
--- /dev/null
+++ b/migrations/versions/15041b7085fe_.py
@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: 15041b7085fe
+Revises: 40384fa03dd1, 969126bd800f
+Create Date: 2018-02-14 17:52:17.138127
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '15041b7085fe'
+down_revision = ('40384fa03dd1', '969126bd800f')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass
diff --git a/migrations/versions/f9571a5ab4f3_.py b/migrations/versions/f9571a5ab4f3_.py
deleted file mode 100644
index da1ba02d6d..0000000000
--- a/migrations/versions/f9571a5ab4f3_.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Rename 'image_url' to 'profile_image_url'
-
- a revision was changed after we pulled it from upstream in m12, so it had to
- be fixed here.
-
-
-Revision ID: f9571a5ab4f3
-Revises: 40384fa03dd1
-Create Date: 2018-01-18 18:04:07.943843
-"""
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision = 'f9571a5ab4f3'
-down_revision = '40384fa03dd1'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # Upstream changed the column name in migration revision 7671dca4e604 --
-    # see git revision 62e5e3892603502c5f3a6da277c33c73510b8819
-    op.alter_column('users', 'image_url', new_column_name='profile_image_url')
-
-
-def downgrade():
-    op.alter_column('users', 'profile_image_url', new_column_name='image_url')