aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
diff options
context:
space:
mode:
authorJosie <josephine.bartholoma@mgail.com>2013-11-18 20:05:15 -0500
committerJosie <josephine.bartholoma@mgail.com>2013-11-18 20:05:15 -0500
commit7dfcc538d3a5f9aaedee294d4a870c2676470d68 (patch)
tree45ab3dbb3398900d58ee1c134d70602b3ef1155c /mediagoblin/db
parenta442823bc1d8bc4946749a036a5460ceea456a9b (diff)
downloadmediagoblin-7dfcc538d3a5f9aaedee294d4a870c2676470d68.tar.lz
mediagoblin-7dfcc538d3a5f9aaedee294d4a870c2676470d68.tar.xz
mediagoblin-7dfcc538d3a5f9aaedee294d4a870c2676470d68.zip
Addressed ticket number 630 by removing MediaEntry.collected
Diffstat (limited to 'mediagoblin/db')
-rw-r--r--mediagoblin/db/migrations.py14
-rw-r--r--mediagoblin/db/models.py3
2 files changed, 15 insertions, 2 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 966817fc..339bc963 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -707,3 +707,17 @@ def create_moderation_tables(db):
is_admin.drop()
db.commit()
+@RegisterMigration(19, MIGRATIONS)
+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 = media_collected.columns['collected']
+
+
+ media_collected.drop()
+
+ db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 1514a3aa..079578a2 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -219,12 +219,11 @@ class MediaEntry(Base, MediaEntryMixin):
state = Column(Unicode, default=u'unprocessed', nullable=False)
# or use sqlalchemy.types.Enum?
license = Column(Unicode)
- collected = Column(Integer, default=0)
+
file_size = Column(Integer, default=0)
fail_error = Column(Unicode)
fail_metadata = Column(JSONEncoded)
-
transcoding_progress = Column(SmallInteger)
queued_media_file = Column(PathTupleWithSlashes)