aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/migrations.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2013-07-30 17:09:01 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2013-07-31 20:11:26 -0400
commit9d6e453f8fd337813c2933835aedff2949193fbe (patch)
tree99a307b30ea3bbc6cfc81c4e9d2ea437935e894e /mediagoblin/db/migrations.py
parent52a355b27541597fc155dab5e4885207b12a0a7b (diff)
downloadmediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.lz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.tar.xz
mediagoblin-9d6e453f8fd337813c2933835aedff2949193fbe.zip
This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I cleared them up.
Diffstat (limited to 'mediagoblin/db/migrations.py')
-rw-r--r--mediagoblin/db/migrations.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 53df7954..972908be 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -404,7 +404,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.i
+ media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False)
class ArchivedReport_v0(ReportBase_v0):
__tablename__ = 'core__reports_archived'