Merge related migrations together

migrations/versions/10879048c708_login_attempts.py → migrations/versions/221d918aa9f0_add_user_authentication_infos.py

@@ -1,13 +1,13 @@
-"""Login attempts
+"""Add user authentication infos
 
-Revision ID: 10879048c708
-Revises: 127be3fb000
-Create Date: 2016-03-07 17:27:37.159830
+Revision ID: 221d918aa9f0
+Revises: 94b3d7958114
+Create Date: 2016-06-06 13:45:52.915050
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '10879048c708'
+revision = '221d918aa9f0'
 down_revision = '127be3fb000'
 
 from alembic import op
@@ -16,6 +16,7 @@ import sqlalchemy as sa
 
 def upgrade():
     ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('activated', sa.Boolean(), nullable=True))
     op.add_column('users', sa.Column('last_failed_login', sa.DateTime(), nullable=True))
     op.add_column('users', sa.Column('login_attempts', sa.Integer(), nullable=True))
     ### end Alembic commands ###
@@ -23,6 +24,7 @@ def upgrade():
 
 def downgrade():
     ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'activated')
     op.drop_column('users', 'login_attempts')
     op.drop_column('users', 'last_failed_login')
     ### end Alembic commands ###

migrations/versions/94b3d7958114_add_account_active_state.py

@@ -1,26 +0,0 @@
-"""Add account active state
-
-Revision ID: 94b3d7958114
-Revises: 10879048c708
-Create Date: 2016-04-29 20:40:26.762939
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = '94b3d7958114'
-down_revision = '10879048c708'
-
-from alembic import op
-import sqlalchemy as sa
-
-
-def upgrade():
-    ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('activated', sa.Boolean(), nullable=True))
-    ### end Alembic commands ###
-
-
-def downgrade():
-    ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'activated')
-    ### end Alembic commands ###