From 389d2b413eb7435c876e95b2a55a24361c92db5c Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Thu, 14 Apr 2022 18:06:08 -0400 Subject: [PATCH] More work on igrations --- crc/models/data_store.py | 2 +- crc/models/file.py | 2 +- .../3489d5a6a2c0_migrate_file_data_to_document_table.py | 6 +++++- migrations/versions/92d554ab6e32_file_refactor.py | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crc/models/data_store.py b/crc/models/data_store.py index c1c21fc0..3304ae67 100644 --- a/crc/models/data_store.py +++ b/crc/models/data_store.py @@ -14,7 +14,7 @@ class DataStoreModel(db.Model): task_spec = db.Column(db.String) spec_id = db.Column(db.String) user_id = db.Column(db.String, nullable=True) - file_id = db.Column(db.Integer, db.ForeignKey('file.id'), nullable=True) + # file_id = db.Column(db.Integer, db.ForeignKey('file.id'), nullable=True) document_id = db.Column(db.Integer, db.ForeignKey('document.id'), nullable=True) value = db.Column(db.String) diff --git a/crc/models/file.py b/crc/models/file.py index b75fa898..6ba2757c 100644 --- a/crc/models/file.py +++ b/crc/models/file.py @@ -105,7 +105,7 @@ class FileModel(db.Model): workflow_id = db.Column(db.Integer, db.ForeignKey('workflow.id'), nullable=True) task_spec = db.Column(db.String, nullable=True) irb_doc_code = db.Column(db.String, nullable=True) # Code reference to the documents.xlsx reference file. - data_stores = relationship(DataStoreModel, cascade="all,delete", backref="file") + # data_stores = relationship(DataStoreModel, cascade="all,delete", backref="file") class File(object): diff --git a/migrations/versions/3489d5a6a2c0_migrate_file_data_to_document_table.py b/migrations/versions/3489d5a6a2c0_migrate_file_data_to_document_table.py index 6d4fe81a..4d820432 100644 --- a/migrations/versions/3489d5a6a2c0_migrate_file_data_to_document_table.py +++ b/migrations/versions/3489d5a6a2c0_migrate_file_data_to_document_table.py @@ -74,8 +74,12 @@ def upgrade(): # except Exception as e: # app.logger.info( # f'Error migrating file data. File ID: {file_model.id}, File Data ID: {file_data_model.id}, Original error: {e}') + op.drop_constraint('file_id_key', 'data_store', type_='foreignkey') + # op.drop_column('data_store', 'file_id') def downgrade(): - op.execute('DELETE FROM document;') + # op.add_column('data_store', sa.Column('file_id', sa.Integer(), nullable=True)) + # op.create_foreign_key('file_id_key', 'data_store', 'file', ['file_id'], ['id']) op.execute('UPDATE data_store SET document_id = null') + op.execute('DELETE FROM document;') diff --git a/migrations/versions/92d554ab6e32_file_refactor.py b/migrations/versions/92d554ab6e32_file_refactor.py index e72b310c..b152face 100644 --- a/migrations/versions/92d554ab6e32_file_refactor.py +++ b/migrations/versions/92d554ab6e32_file_refactor.py @@ -44,6 +44,6 @@ def upgrade(): def downgrade(): + op.drop_constraint('document_id_key', 'data_store', type_='foreignkey') + op.drop_column('data_store', 'document_id') op.drop_table('document') - # op.drop_column('data_store', 'document_id') - # op.drop_constraint('document_id_key', 'data_store', type_='foreignkey')