sqlalchemy conflicts fix
This commit is contained in:
parent
eb0370cf60
commit
1fa50281da
7
app.py
7
app.py
@ -89,12 +89,9 @@ class Comments(db.Model):
|
|||||||
|
|
||||||
image = db.relationship('Image', back_populates='comments')
|
image = db.relationship('Image', back_populates='comments')
|
||||||
video = db.relationship('Video', back_populates='comments')
|
video = db.relationship('Video', back_populates='comments')
|
||||||
comic = db.relationship('Comic', backref='comic_link', lazy=True)
|
comic = db.relationship('Comic', back_populates='comments', overlaps="comic_link")
|
||||||
post = db.relationship('Post', backref='comments')
|
post = db.relationship('Post', backref='comments')
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return f'<Comment {self.id}>'
|
|
||||||
|
|
||||||
class User(db.Model, UserMixin):
|
class User(db.Model, UserMixin):
|
||||||
id = db.Column(db.Integer, primary_key=True)
|
id = db.Column(db.Integer, primary_key=True)
|
||||||
username = db.Column(db.String(20), unique=True, nullable=False)
|
username = db.Column(db.String(20), unique=True, nullable=False)
|
||||||
@ -165,7 +162,7 @@ class Comic(db.Model):
|
|||||||
tags = db.Column(db.String(100), nullable=True)
|
tags = db.Column(db.String(100), nullable=True)
|
||||||
cookie_votes = db.Column(db.Integer, default=0)
|
cookie_votes = db.Column(db.Integer, default=0)
|
||||||
|
|
||||||
comments = db.relationship('Comments', backref='comic_link', lazy=True)
|
comments = db.relationship('Comments', back_populates='comic', overlaps="comic_link")
|
||||||
|
|
||||||
class ComicVotes(db.Model):
|
class ComicVotes(db.Model):
|
||||||
__tablename__ = 'comic_votes'
|
__tablename__ = 'comic_votes'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user