Prepping for merging current dev.

Will need to change the down revision, and fix the migration
This commit is contained in:
mike cullerton 2022-01-18 08:17:36 -05:00
parent 6da6e05171
commit 6e0bf65093
2 changed files with 4 additions and 2 deletions

View File

@ -12,6 +12,7 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '65b5ed6ae05b' revision = '65b5ed6ae05b'
down_revision = '44dd9397c555' down_revision = '44dd9397c555'
# down_revision = '1fb36d682c7f'
branch_labels = None branch_labels = None
depends_on = None depends_on = None
@ -24,6 +25,6 @@ def upgrade():
def downgrade(): def downgrade():
# There are already valid uses of '-' in these tables. # There are already valid uses of '-' in these tables.
# We probably don't want to change them to '/' # We probably don't want to change all of them to '/'
# So, we pass here. No downgrade. # So, we pass here. No downgrade.
pass pass

View File

@ -48,7 +48,8 @@ def upgrade():
# TODO: # TODO:
# delete processed files from file_data table # delete processed files from file_data table
# delete workflow_spec_dependency_file table # delete workflow_spec_dependency_file table
# delete file_data_model_id from lookup_file table # delete file_data_model_id from lookup_file table <-- This is wrong! We should change to file_id,
# see migration 4980cb3dea77
for file_id in processed_files: for file_id in processed_files:
processed_models = session.query(FileDataModel).filter(FileDataModel.file_model_id==file_id).all() processed_models = session.query(FileDataModel).filter(FileDataModel.file_model_id==file_id).all()
for processed_model in processed_models: for processed_model in processed_models: