diff options
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/migrations.py | 4 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 2e05bf2a..ff74aa30 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -494,7 +494,7 @@ class CommentReport_v0(ReportBase_v0): id = Column('id',Integer, ForeignKey('core__reports.id'), primary_key=True) - comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=False) + comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=True) @@ -503,7 +503,7 @@ class MediaReport_v0(ReportBase_v0): __mapper_args__ = {'polymorphic_identity': 'media_report'} id = Column('id',Integer, ForeignKey('core__reports.id'), primary_key=True) - media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False) + media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=True) class UserBan_v0(declarative_base()): __tablename__ = 'core__user_bans' diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index cec311f2..466f31b8 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -764,8 +764,7 @@ class CommentReport(ReportBase): comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=True) comment = relationship( MediaComment, backref=backref("reports_filed_on", - lazy="dynamic", - cascade="all, delete-orphan")) + lazy="dynamic")) class MediaReport(ReportBase): @@ -782,9 +781,8 @@ class MediaReport(ReportBase): media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=True) media_entry = relationship( MediaEntry, - backref=backref("reports_filed_onmod/reports/1/", - lazy="dynamic", - cascade="all, delete-orphan")) + backref=backref("reports_filed_on", + lazy="dynamic")) class UserBan(Base): """ |