Merge plugin migration files

migrations/1214305c96eb_make_setting_value_types_enum.py

@@ -1,48 +0,0 @@
-"""Make setting value types enum
-
-Revision ID: 1214305c96eb
-Revises: 7c3fcf8a3335
-Create Date: 2017-09-10 10:29:54.334710
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '1214305c96eb'
-down_revision = '7c3fcf8a3335'
-branch_labels = ()
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('plugin_store', schema=None) as batch_op:
-        batch_op.alter_column('description',
-               existing_type=sa.TEXT(),
-               nullable=True)
-        batch_op.alter_column('extra',
-               existing_type=sa.BLOB(),
-               nullable=True)
-        batch_op.alter_column('value',
-               existing_type=sa.BLOB(),
-               nullable=False)
-
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('plugin_store', schema=None) as batch_op:
-        batch_op.alter_column('value',
-               existing_type=sa.BLOB(),
-               nullable=True)
-        batch_op.alter_column('extra',
-               existing_type=sa.BLOB(),
-               nullable=False)
-        batch_op.alter_column('description',
-               existing_type=sa.TEXT(),
-               nullable=False)
-
-    # ### end Alembic commands ###

migrations/7c3fcf8a3335_add_plugin_tables.py

@@ -29,12 +29,15 @@ def upgrade():
         'plugin_store',
         sa.Column('id', sa.Integer(), nullable=False),
         sa.Column('key', sa.Unicode(length=255), nullable=False),
-        sa.Column('value', sa.PickleType(), nullable=True),
-        sa.Column('value_type', sa.Unicode(length=20), nullable=False),
-        sa.Column('extra', sa.PickleType(), nullable=False),
+        sa.Column('value', sa.PickleType(), nullable=False),
+        sa.Column('value_type', sa.Enum(
+            'string', 'integer', 'float', 'boolean', 'select', 'selectmultiple',
+            name='settingsvaluetypes'), nullable=False
+        ),
+        sa.Column('extra', sa.PickleType(), nullable=True),
         sa.Column('plugin_id', sa.Integer(), nullable=True),
         sa.Column('name', sa.Unicode(length=255), nullable=False),
-        sa.Column('description', sa.Text(), nullable=False),
+        sa.Column('description', sa.Text(), nullable=True),
         sa.ForeignKeyConstraint(
             ['plugin_id'],
             ['plugin_registry.id'],