From a00fe8b8ef80f7984801a126f58131c0e626173c Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 20 Feb 2024 11:53:55 +0300 Subject: [PATCH] orm-update2 --- orm/author.py | 4 ++-- orm/invite.py | 6 +++--- orm/reaction.py | 8 ++++---- orm/shout.py | 16 ++++++++-------- orm/topic.py | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/orm/author.py b/orm/author.py index 65c95073..28726627 100644 --- a/orm/author.py +++ b/orm/author.py @@ -11,7 +11,7 @@ class AuthorRating(Base): id = None # type: ignore rater = Column(ForeignKey('author.id'), primary_key=True) - author = Column(ForeignKey('author.id'), primary_key=True, index=True) + author = Column(ForeignKey('author.id'), primary_key=True) plus = Column(Boolean) @@ -20,7 +20,7 @@ class AuthorFollower(Base): id = None # type: ignore follower = Column(ForeignKey('author.id'), primary_key=True) - author = Column(ForeignKey('author.id'), primary_key=True, index=True) + author = Column(ForeignKey('author.id'), primary_key=True) created_at = Column(Integer, nullable=False, default=lambda: int(time.time())) auto = Column(Boolean, nullable=False, default=False) diff --git a/orm/invite.py b/orm/invite.py index 972df370..975c61bb 100644 --- a/orm/invite.py +++ b/orm/invite.py @@ -17,9 +17,9 @@ class InviteStatus(Enumeration): class Invite(Base): __tablename__ = 'invite' - inviter_id = Column(ForeignKey('author.id'), nullable=False, index=True) - author_id = Column(ForeignKey('author.id'), nullable=False, index=True) - shout_id = Column(ForeignKey('shout.id'), nullable=False, index=True) + inviter_id = Column(ForeignKey('author.id'), primary_key=True) + author_id = Column(ForeignKey('author.id'), primary_key=True) + shout_id = Column(ForeignKey('shout.id'), primary_key=True) status = Column(String, default=InviteStatus.PENDING.value) inviter = relationship(Author, foreign_keys=[inviter_id]) diff --git a/orm/reaction.py b/orm/reaction.py index 5ceb27a3..cfcc008c 100644 --- a/orm/reaction.py +++ b/orm/reaction.py @@ -33,11 +33,11 @@ class Reaction(Base): created_at = Column(Integer, nullable=False, default=lambda: int(time.time())) updated_at = Column(Integer, nullable=True, comment='Updated at') deleted_at = Column(Integer, nullable=True, comment='Deleted at') - deleted_by = Column(ForeignKey('author.id'), nullable=True, index=True) + deleted_by = Column(ForeignKey('author.id'), nullable=True) reply_to = Column(ForeignKey('reaction.id'), nullable=True) quote = Column(String, nullable=True, comment='Original quoted text') - shout = Column(ForeignKey('shout.id'), nullable=False, index=True) - created_by = Column(ForeignKey('author.id'), nullable=False, index=True) - kind = Column(String, nullable=False, index=True) + shout = Column(ForeignKey('shout.id'), nullable=False) + created_by = Column(ForeignKey('author.id'), nullable=False) + kind = Column(String, nullable=False) oid = Column(String) diff --git a/orm/shout.py b/orm/shout.py index 2757bcb6..74e1aa8a 100644 --- a/orm/shout.py +++ b/orm/shout.py @@ -14,8 +14,8 @@ class ShoutTopic(Base): __tablename__ = 'shout_topic' id = None # type: ignore - shout = Column(ForeignKey('shout.id'), primary_key=True, index=True) - topic = Column(ForeignKey('topic.id'), primary_key=True, index=True) + shout = Column(ForeignKey('shout.id'), primary_key=True) + topic = Column(ForeignKey('topic.id'), primary_key=True) main = Column(Boolean, nullable=True) @@ -23,8 +23,8 @@ class ShoutReactionsFollower(Base): __tablename__ = 'shout_reactions_followers' id = None # type: ignore - follower = Column(ForeignKey('author.id'), primary_key=True, index=True) - shout = Column(ForeignKey('shout.id'), primary_key=True, index=True) + follower = Column(ForeignKey('author.id'), primary_key=True) + shout = Column(ForeignKey('shout.id'), primary_key=True) auto = Column(Boolean, nullable=False, default=False) created_at = Column(Integer, nullable=False, default=lambda: int(time.time())) deleted_at = Column(Integer, nullable=True) @@ -34,8 +34,8 @@ class ShoutAuthor(Base): __tablename__ = 'shout_author' id = None # type: ignore - shout = Column(ForeignKey('shout.id'), primary_key=True, index=True) - author = Column(ForeignKey('author.id'), primary_key=True, index=True) + shout = Column(ForeignKey('shout.id'), primary_key=True) + author = Column(ForeignKey('author.id'), primary_key=True) caption = Column(String, nullable=True, default='') @@ -43,8 +43,8 @@ class ShoutCommunity(Base): __tablename__ = 'shout_community' id = None # type: ignore - shout = Column(ForeignKey('shout.id'), primary_key=True, index=True) - community = Column(ForeignKey('community.id'), primary_key=True, index=True) + shout = Column(ForeignKey('shout.id'), primary_key=True) + community = Column(ForeignKey('community.id'), primary_key=True) class Shout(Base): diff --git a/orm/topic.py b/orm/topic.py index 928b0129..a4b2826f 100644 --- a/orm/topic.py +++ b/orm/topic.py @@ -9,8 +9,8 @@ class TopicFollower(Base): __tablename__ = 'topic_followers' id = None # type: ignore - follower = Column(ForeignKey('author.id'), primary_key=True, index=True) - topic = Column(ForeignKey('topic.id'), primary_key=True, index=True) + follower = Column(ForeignKey('author.id'), primary_key=True) + topic = Column(ForeignKey('topic.id'), primary_key=True) created_at = Column(Integer, nullable=False, default=lambda: int(time.time())) auto = Column(Boolean, nullable=False, default=False)