diff options
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/migrations.py | 5 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 339bc963..426080a2 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -713,11 +713,10 @@ def drop_MediaEntry_collected(db): Drop unused MediaEntry.collected column """ metadata = MetaData(bind=db.bind) - media_collected= inspect_table(metadata, 'core__media_entries') + media_collected= inspect_table(metadata, 'core__media_entries') media_collected = media_collected.columns['collected'] - media_collected.drop() - + db.commit() diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 079578a2..b750375d 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -219,11 +219,11 @@ class MediaEntry(Base, MediaEntryMixin): state = Column(Unicode, default=u'unprocessed', nullable=False) # or use sqlalchemy.types.Enum? license = Column(Unicode) - file_size = Column(Integer, default=0) fail_error = Column(Unicode) fail_metadata = Column(JSONEncoded) + transcoding_progress = Column(SmallInteger) queued_media_file = Column(PathTupleWithSlashes) |