diff --git a/migrations/versions/41f75a5ff745_.py b/migrations/versions/41f75a5ff745_.py deleted file mode 100644 index ff7b7496..00000000 --- a/migrations/versions/41f75a5ff745_.py +++ /dev/null @@ -1,30 +0,0 @@ -"""empty message - -Revision ID: 41f75a5ff745 -Revises: 95eecbe83668 -Create Date: 2019-10-17 10:07:51.595833 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '41f75a5ff745' -down_revision = '95eecbe83668' -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('job_results', sa.Column('job_input_id', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'job_results', 'job_inputs', ['job_input_id'], ['id']) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'job_results', type_='foreignkey') - op.drop_column('job_results', 'job_input_id') - # ### end Alembic commands ### diff --git a/migrations/versions/95eecbe83668_.py b/migrations/versions/95eecbe83668_.py deleted file mode 100644 index f108b7cc..00000000 --- a/migrations/versions/95eecbe83668_.py +++ /dev/null @@ -1,105 +0,0 @@ -"""empty message - -Revision ID: 95eecbe83668 -Revises: -Create Date: 2019-10-17 09:20:19.740233 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '95eecbe83668' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('roles', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('default', sa.Boolean(), nullable=True), - sa.Column('name', sa.String(length=64), nullable=True), - sa.Column('permissions', sa.Integer(), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('name') - ) - op.create_index(op.f('ix_roles_default'), 'roles', ['default'], unique=False) - op.create_table('users', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('confirmed', sa.Boolean(), nullable=True), - sa.Column('email', sa.String(length=254), nullable=True), - sa.Column('password_hash', sa.String(length=128), nullable=True), - sa.Column('registration_date', sa.DateTime(), nullable=True), - sa.Column('role_id', sa.Integer(), nullable=True), - sa.Column('username', sa.String(length=64), nullable=True), - sa.Column('is_dark', sa.Boolean(), nullable=True), - sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_index(op.f('ix_users_email'), 'users', ['email'], unique=True) - op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True) - op.create_table('corpora', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('creation_date', sa.DateTime(), nullable=True), - sa.Column('description', sa.String(length=255), nullable=True), - sa.Column('title', sa.String(length=32), nullable=True), - sa.Column('user_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('jobs', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('creation_date', sa.DateTime(), nullable=True), - sa.Column('description', sa.String(length=255), nullable=True), - sa.Column('end_date', sa.DateTime(), nullable=True), - sa.Column('mem_mb', sa.Integer(), nullable=True), - sa.Column('n_cores', sa.Integer(), nullable=True), - sa.Column('service', sa.String(length=64), nullable=True), - sa.Column('service_args', sa.String(length=255), nullable=True), - sa.Column('service_version', sa.String(length=16), nullable=True), - sa.Column('status', sa.String(length=16), nullable=True), - sa.Column('title', sa.String(length=32), nullable=True), - sa.Column('user_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('corpus_files', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('filename', sa.String(length=255), nullable=True), - sa.Column('corpus_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['corpus_id'], ['corpora.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('job_inputs', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('filename', sa.String(length=255), nullable=True), - sa.Column('job_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), - sa.PrimaryKeyConstraint('id') - ) - op.create_table('job_results', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('filename', sa.String(length=255), nullable=True), - sa.Column('job_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), - sa.PrimaryKeyConstraint('id') - ) - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('job_results') - op.drop_table('job_inputs') - op.drop_table('corpus_files') - op.drop_table('jobs') - op.drop_table('corpora') - op.drop_index(op.f('ix_users_username'), table_name='users') - op.drop_index(op.f('ix_users_email'), table_name='users') - op.drop_table('users') - op.drop_index(op.f('ix_roles_default'), table_name='roles') - op.drop_table('roles') - # ### end Alembic commands ### diff --git a/migrations/versions/91ef50fe9f01_.py b/migrations/versions/da9fd175af8c_.py similarity index 91% rename from migrations/versions/91ef50fe9f01_.py rename to migrations/versions/da9fd175af8c_.py index 6d5d5230..421c5059 100644 --- a/migrations/versions/91ef50fe9f01_.py +++ b/migrations/versions/da9fd175af8c_.py @@ -1,8 +1,8 @@ """empty message -Revision ID: 91ef50fe9f01 +Revision ID: da9fd175af8c Revises: -Create Date: 2019-10-17 09:37:36.995203 +Create Date: 2019-10-23 08:11:02.741683 """ from alembic import op @@ -10,7 +10,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. -revision = '91ef50fe9f01' +revision = 'da9fd175af8c' down_revision = None branch_labels = None depends_on = None @@ -69,6 +69,7 @@ def upgrade(): op.create_table('corpus_files', sa.Column('id', sa.Integer(), nullable=False), sa.Column('filename', sa.String(length=255), nullable=True), + sa.Column('dir', sa.String(length=255), nullable=True), sa.Column('corpus_id', sa.Integer(), nullable=True), sa.ForeignKeyConstraint(['corpus_id'], ['corpora.id'], ), sa.PrimaryKeyConstraint('id') @@ -76,6 +77,7 @@ def upgrade(): op.create_table('job_inputs', sa.Column('id', sa.Integer(), nullable=False), sa.Column('filename', sa.String(length=255), nullable=True), + sa.Column('dir', sa.String(length=255), nullable=True), sa.Column('job_id', sa.Integer(), nullable=True), sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), sa.PrimaryKeyConstraint('id') @@ -83,8 +85,11 @@ def upgrade(): op.create_table('job_results', sa.Column('id', sa.Integer(), nullable=False), sa.Column('filename', sa.String(length=255), nullable=True), + sa.Column('dir', sa.String(length=255), nullable=True), sa.Column('job_id', sa.Integer(), nullable=True), + sa.Column('job_input_id', sa.Integer(), nullable=True), sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), + sa.ForeignKeyConstraint(['job_input_id'], ['job_inputs.id'], ), sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ###