From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 15 Apr 2014 17:51:27 +0000 (-0400)
Subject: Moved the metadata column to MediaEntry rather than MediaFile
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b91df79041f59ec87ad2e6f48ca6aa2a78de3c1d;p=mediagoblin.git

Moved the metadata column to MediaEntry rather than MediaFile
---

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index a7400bf0..294ab43b 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -723,12 +723,12 @@ def drop_MediaEntry_collected(db):
     db.commit()
 
 @RegisterMigration(20, MIGRATIONS)
-def add_work_metadata_column(db):
+def add_metadata_column(db):
     metadata = MetaData(bind=db.bind)
 
-    media_file = inspect_table(metadata, 'core__mediafiles')
+    media_entry = inspect_table(metadata, 'core__media_entries')
 
-    col = Column('work_metadata', MutationDict.as_mutable(JSONEncoded))
-    col.create(media_file)
+    col = Column('metadata', MutationDict.as_mutable(JSONEncoded))
+    col.create(media_entry)
 
     db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index ac69d040..7c0f0bf3 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -264,6 +264,7 @@ class MediaEntry(Base, MediaEntryMixin):
         cascade="all, delete-orphan"
         )
     collections = association_proxy("collections_helper", "in_collection")
+    metadata = Column(MutationDict.as_mutable(JSONEncoded))
 
     ## TODO
     # fail_error
@@ -420,7 +421,6 @@ class MediaFile(Base):
     name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False)
     file_path = Column(PathTupleWithSlashes)
     file_metadata = Column(MutationDict.as_mutable(JSONEncoded))
-    work_metadata = Column(MutationDict.as_mutable(JSONEncoded))
 
     __table_args__ = (
         PrimaryKeyConstraint('media_entry', 'name_id'),