diff --git a/server/szurubooru/migrations/versions/336a76ec1338_create_post_tables.py b/server/szurubooru/migrations/versions/336a76ec1338_create_post_tables.py index aea6cc78..82e78099 100644 --- a/server/szurubooru/migrations/versions/336a76ec1338_create_post_tables.py +++ b/server/szurubooru/migrations/versions/336a76ec1338_create_post_tables.py @@ -29,6 +29,7 @@ def upgrade(): sa.Column("image_width", sa.Integer(), nullable=True), sa.Column("image_height", sa.Integer(), nullable=True), sa.Column("flags", sa.Integer(), nullable=False), + sa.Column("description", sa.UnicodeText, nullable=True, default=""), sa.Column("auto_fav_count", sa.Integer(), nullable=False), sa.Column("auto_score", sa.Integer(), nullable=False), sa.Column("auto_feature_count", sa.Integer(), nullable=False), diff --git a/server/szurubooru/model/post.py b/server/szurubooru/model/post.py index bb9c6b0a..b1c10fb8 100644 --- a/server/szurubooru/model/post.py +++ b/server/szurubooru/model/post.py @@ -110,23 +110,6 @@ class PostNote(Base): post = sa.orm.relationship("Post") - -class PostDesc(Base): - __tablename__ = "post_desc" - - post_desc_id = sa.Column("id", sa.Integer, primary_key=True) - post_id = sa.Column( - "post_id", - sa.Integer, - sa.ForeignKey("post.id"), - nullable=False, - index=True, - ) - text = sa.Column("text", sa.UnicodeText, nullable=False) - - post = sa.orm.relationship("Post") - - class PostRelation(Base): __tablename__ = "post_relation" @@ -238,6 +221,7 @@ class Post(Base): canvas_width = sa.Column("image_width", sa.Integer) canvas_height = sa.Column("image_height", sa.Integer) mime_type = sa.Column("mime-type", sa.Unicode(32), nullable=False) + desc = sa.Column("description", sa.UnicodeText, nullable=True, default="") # foreign tables user = sa.orm.relationship("User") @@ -268,9 +252,6 @@ class Post(Base): notes = sa.orm.relationship( "PostNote", cascade="all, delete-orphan", lazy="joined" ) - desc = sa.orm.relationship( - "PostDesc", cascade="all, delete-orphan", lazy="joined" - ) comments = sa.orm.relationship("Comment", cascade="all, delete-orphan") _pools = sa.orm.relationship( "PoolPost",