1 files changed, 20 insertions, 1 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 29b2522a..7074ffec 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -288,6 +288,25 @@ def unique_collections_slug(db):
 
     db.commit()
 
+@RegisterMigration(11, MIGRATIONS)
+def drop_token_related_User_columns(db):
+    """
+    Drop unneeded columns from the User table after switching to using
+    itsdangerous tokens for email and forgot password verification.
+    """
+    metadata = MetaData(bind=db.bind)
+    user_table = inspect_table(metadata, 'core__users')
+
+    verification_key = user_table.columns['verification_key']
+    fp_verification_key = user_table.columns['fp_verification_key']
+    fp_token_expire = user_table.columns['fp_token_expire']
+
+    verification_key.drop()
+    fp_verification_key.drop()
+    fp_token_expire.drop()
+
+    db.commit()
+
 class CommentSubscription_v0(declarative_base()):
     __tablename__ = 'core__comment_subscriptions'
     id = Column(Integer, primary_key=True)
@@ -329,7 +348,7 @@ class ProcessingNotification_v0(Notification_v0):
     subject_id = Column(Integer, ForeignKey(MediaEntry.id))
 
 
-@RegisterMigration(11, MIGRATIONS)
+@RegisterMigration(12, MIGRATIONS)
 def add_new_notification_tables(db):
     metadata = MetaData(bind=db.bind)