From a9ed0ec5486a6bd63f706592dd1eaa01f6c2ea1d Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 8 Jul 2020 10:59:09 +0200 Subject: adding tag field to media --- .../cli/app/controllers/upload_controller.py | 2 +- animism-align/cli/app/sql/models/media.py | 2 +- animism-align/cli/app/sql/models/upload.py | 2 +- .../202007081033_add_fields_to_media_part_2.py | 33 ++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 animism-align/cli/app/sql/versions/202007081033_add_fields_to_media_part_2.py (limited to 'animism-align/cli') diff --git a/animism-align/cli/app/controllers/upload_controller.py b/animism-align/cli/app/controllers/upload_controller.py index 0b3b4c5..5fec077 100644 --- a/animism-align/cli/app/controllers/upload_controller.py +++ b/animism-align/cli/app/controllers/upload_controller.py @@ -103,7 +103,7 @@ class UploadView(FlaskView): # nparr.tofile(uploaded_im_fullpath) file.save(uploaded_im_fullpath) - upload = Upload(username=username, fn=uploaded_im_stored_fn, sha256=sha256, ext=ext) + upload = Upload(username=username, tag=tag, fn=uploaded_im_stored_fn, sha256=sha256, ext=ext) session.add(upload) session.commit() response = { diff --git a/animism-align/cli/app/sql/models/media.py b/animism-align/cli/app/sql/models/media.py index 77b99ca..8795e70 100644 --- a/animism-align/cli/app/sql/models/media.py +++ b/animism-align/cli/app/sql/models/media.py @@ -13,7 +13,7 @@ class Media(Base): __tablename__ = 'media' id = Column(Integer, primary_key=True) type = Column(String(16, convert_unicode=True), nullable=False) - tag = Column(String(64, convert_unicode=True), nullable=False) + tag = Column(String(64, convert_unicode=True), nullable=True) url = Column(String(256, convert_unicode=True), nullable=True) title = Column(String(256, convert_unicode=True), nullable=True) author = Column(String(256, convert_unicode=True), nullable=True) diff --git a/animism-align/cli/app/sql/models/upload.py b/animism-align/cli/app/sql/models/upload.py index 7e8a56e..462c236 100644 --- a/animism-align/cli/app/sql/models/upload.py +++ b/animism-align/cli/app/sql/models/upload.py @@ -17,7 +17,7 @@ class Upload(Base): sha256 = Column(String(256), nullable=False) fn = Column(String(256), nullable=False) ext = Column(String(4, convert_unicode=True), nullable=False) - tag = Column(String(64, convert_unicode=True), nullable=False) + tag = Column(String(64, convert_unicode=True), nullable=True) username = Column(String(16, convert_unicode=True), nullable=False) created_at = Column(UtcDateTime(), default=utcnow()) diff --git a/animism-align/cli/app/sql/versions/202007081033_add_fields_to_media_part_2.py b/animism-align/cli/app/sql/versions/202007081033_add_fields_to_media_part_2.py new file mode 100644 index 0000000..b967ab9 --- /dev/null +++ b/animism-align/cli/app/sql/versions/202007081033_add_fields_to_media_part_2.py @@ -0,0 +1,33 @@ +"""add fields to media part 2 + +Revision ID: d001c45d21a4 +Revises: c93b3c61b053 +Create Date: 2020-07-08 10:33:55.924794 + +""" +from alembic import op +import sqlalchemy as sa +import sqlalchemy_utc + + +# revision identifiers, used by Alembic. +revision = 'd001c45d21a4' +down_revision = 'c93b3c61b053' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('media', sa.Column('medium', sa.String(length=64, _expect_unicode=True), nullable=True)) + op.add_column('media', sa.Column('tag', sa.String(length=64, _expect_unicode=True), nullable=True)) + op.add_column('upload', sa.Column('tag', sa.String(length=64, _expect_unicode=True), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('upload', 'tag') + op.drop_column('media', 'tag') + op.drop_column('media', 'medium') + # ### end Alembic commands ### -- cgit v1.2.3-70-g09d2