skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many to many (#210)

Browse source 
* 8 legs of love

* 8 legs of love 2
This commit is contained in:
Aevann1 2022-02-14 14:25:44 -08:00 • committed by GitHub
parent a84dc419f1
commit 3b126e72f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
files/classes/alts.py
View file

@ -5,9 +5,8 @@ from files.__main__ import Base
class Alt(Base): class Alt(Base):
__tablename__ = "alts" __tablename__ = "alts"
id = Column(Integer, primary_key=True) user1 = Column(Integer, ForeignKey("users.id"), primary_key=True)
user1 = Column(Integer, ForeignKey("users.id")) user2 = Column(Integer, ForeignKey("users.id"), primary_key=True)
user2 = Column(Integer, ForeignKey("users.id"))
is_manual = Column(Boolean, default=False) is_manual = Column(Boolean, default=False)
def __repr__(self): def __repr__(self):

5
files/classes/badges.py
View file

@ -22,9 +22,8 @@ class Badge(Base):
__tablename__ = "badges" __tablename__ = "badges"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
user_id = Column(Integer, ForeignKey('users.id')) badge_id = Column(Integer, ForeignKey('badge_defs.id'), primary_key=True)
badge_id = Column(Integer, ForeignKey('badge_defs.id'))
description = Column(String) description = Column(String)
url = Column(String) url = Column(String)

5
files/classes/comment.py
View file

@ -446,9 +446,8 @@ class Notification(Base):
__tablename__ = "notifications" __tablename__ = "notifications"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) comment_id = Column(Integer, ForeignKey("comments.id"), primary_key=True)
comment_id = Column(Integer, ForeignKey("comments.id"))
read = Column(Boolean, default=False) read = Column(Boolean, default=False)
comment = relationship("Comment", viewonly=True) comment = relationship("Comment", viewonly=True)

3
files/classes/domains.py
View file

@ -4,6 +4,5 @@ from files.__main__ import Base
class BannedDomain(Base): class BannedDomain(Base):
__tablename__ = "banneddomains" __tablename__ = "banneddomains"
id = Column(Integer, primary_key=True) domain = Column(String, primary_key=True)
domain = Column(String)
reason = Column(String) reason = Column(String)

10
files/classes/flags.py
View file

@ -9,9 +9,8 @@ class Flag(Base):
__tablename__ = "flags" __tablename__ = "flags"
id = Column(Integer, primary_key=True) post_id = Column(Integer, ForeignKey("submissions.id"), primary_key=True)
post_id = Column(Integer, ForeignKey("submissions.id")) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"))
reason = Column(String) reason = Column(String)
user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False, viewonly=True) user = relationship("User", primaryjoin = "Flag.user_id == User.id", uselist = False, viewonly=True)
@ -39,9 +38,8 @@ class CommentFlag(Base):
__tablename__ = "commentflags" __tablename__ = "commentflags"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) comment_id = Column(Integer, ForeignKey("comments.id"), primary_key=True)
comment_id = Column(Integer, ForeignKey("comments.id"))
reason = Column(String) reason = Column(String)
user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False, viewonly=True) user = relationship("User", primaryjoin = "CommentFlag.user_id == User.id", uselist = False, viewonly=True)

10
files/classes/subscriptions.py
View file

@ -5,9 +5,8 @@ from files.__main__ import Base
class Subscription(Base): class Subscription(Base):
__tablename__ = "subscriptions" __tablename__ = "subscriptions"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) submission_id = Column(Integer, ForeignKey("submissions.id"), primary_key=True)
submission_id = Column(Integer, ForeignKey("submissions.id"))
user = relationship("User", uselist=False, viewonly=True) user = relationship("User", uselist=False, viewonly=True)
@ -20,9 +19,8 @@ class Subscription(Base):
class Follow(Base): class Follow(Base):
__tablename__ = "follows" __tablename__ = "follows"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) target_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
target_id = Column(Integer, ForeignKey("users.id"))
user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", viewonly=True) user = relationship("User", uselist=False, primaryjoin="User.id==Follow.user_id", viewonly=True)
target = relationship("User", primaryjoin="User.id==Follow.target_id", viewonly=True) target = relationship("User", primaryjoin="User.id==Follow.target_id", viewonly=True)

5
files/classes/user.py
View file

@ -642,9 +642,8 @@ class ViewerRelationship(Base):
__tablename__ = "viewers" __tablename__ = "viewers"
id = Column(Integer, Sequence('viewers_id_seq'), primary_key=True) user_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
user_id = Column(Integer, ForeignKey('users.id')) viewer_id = Column(Integer, ForeignKey('users.id'), primary_key=True)
viewer_id = Column(Integer, ForeignKey('users.id'))
last_view_utc = Column(Integer) last_view_utc = Column(Integer)
viewer = relationship("User", primaryjoin="ViewerRelationship.viewer_id == User.id", viewonly=True) viewer = relationship("User", primaryjoin="ViewerRelationship.viewer_id == User.id", viewonly=True)

5
files/classes/userblock.py
View file

@ -5,9 +5,8 @@ from files.__main__ import Base
class UserBlock(Base): class UserBlock(Base):
__tablename__ = "userblocks" __tablename__ = "userblocks"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) target_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
target_id = Column(Integer, ForeignKey("users.id"))
user = relationship("User", primaryjoin="User.id==UserBlock.user_id", viewonly=True) user = relationship("User", primaryjoin="User.id==UserBlock.user_id", viewonly=True)
target = relationship("User", primaryjoin="User.id==UserBlock.target_id", viewonly=True) target = relationship("User", primaryjoin="User.id==UserBlock.target_id", viewonly=True)

10
files/classes/votes.py
View file

@ -9,10 +9,9 @@ class Vote(Base):
__tablename__ = "votes" __tablename__ = "votes"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) submission_id = Column(Integer, ForeignKey("submissions.id"), primary_key=True)
vote_type = Column(Integer) vote_type = Column(Integer)
submission_id = Column(Integer, ForeignKey("submissions.id"))
app_id = Column(Integer, ForeignKey("oauth_apps.id")) app_id = Column(Integer, ForeignKey("oauth_apps.id"))
real = Column(Boolean, default=True) real = Column(Boolean, default=True)
created_utc = Column(Integer) created_utc = Column(Integer)
@ -51,10 +50,9 @@ class CommentVote(Base):
__tablename__ = "commentvotes" __tablename__ = "commentvotes"
id = Column(Integer, primary_key=True) user_id = Column(Integer, ForeignKey("users.id"), primary_key=True)
user_id = Column(Integer, ForeignKey("users.id")) comment_id = Column(Integer, ForeignKey("comments.id"), primary_key=True)
vote_type = Column(Integer) vote_type = Column(Integer)
comment_id = Column(Integer, ForeignKey("comments.id"))
app_id = Column(Integer, ForeignKey("oauth_apps.id")) app_id = Column(Integer, ForeignKey("oauth_apps.id"))
real = Column(Boolean, default=True) real = Column(Boolean, default=True)
created_utc = Column(Integer) created_utc = Column(Integer)