-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
✨ Add Controlled Access field to Genomic file entity #109
Conversation
migrations/versions/f80726457a72_.py
Outdated
|
||
# revision identifiers, used by Alembic. | ||
revision = 'f80726457a72' | ||
down_revision = '0cc35a21afc2' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this revision may need to be modified because of the new version added in the last merge
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you change this to b7852f8aab0a
I think you can get rid of the merge version.
e4d57a7
to
3c69932
Compare
🗃️ Remove postgres id and use kf_id as primary key 🗃️ Add migration for new primary key
3c69932
to
b269108
Compare
migrations/versions/1c790b83f611_.py
Outdated
@@ -0,0 +1,30 @@ | |||
"""rename file_type to data_type for genomic_file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is nit picking but can you change to:
"""
Rename file_type to data_type for genomic_file
Revision ID: 1c790b83f611
Revises: f80726457a72
Create Date: 2018-02-12 15:33:27.365798
"""
migrations/versions/f80726457a72_.py
Outdated
@@ -0,0 +1,28 @@ | |||
"""Add Controlled_access field to genomic_file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar request as above, can you change to:
"""
Add Controlled_access field to genomic_file
Revision ID: f80726457a72
Revises: b7852f8aab0a
Create Date: 2018-02-07 16:12:38.279955
"""
migrations/versions/f80726457a72_.py
Outdated
@@ -0,0 +1,28 @@ | |||
"""Add Controlled_access field to genomic_file | |||
|
|||
Revision ID: f80726457a72 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you should be able to combine these two migration script into one. On your branch, you could do:
git reset origin/master migrations
rm migrations/versions/1c790b83f611_.py migrations/versions/f80726457a72_.py
# Make sure your dataservice containers are running, and if not run:
docker-compose up -d
# Generate new migration script
flask db migrate
That should generate a new migration script. Make sure you update the docstring to include both the field changes
147d69f
to
0e773df
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
✨ Update fields(controlled_access, data_type) in Genomic file entity |
✨ Update fields(controlled_access, data_type) in Genomic file entity
Added Controlled Access field to Genomic file entity.
Renamed file_type to data_type.
Updated dummy data generation script,migrations and tests