Merge branch 'metadata'

2 files changed, 15 insertions, 0 deletions

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 426080a2..dd69ad6e 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -31,6 +31,7 @@ from mediagoblin.db.migration_tools import (
     RegisterMigration, inspect_table, replace_table_hack)
 from mediagoblin.db.models import (MediaEntry, Collection, MediaComment, User, 
         Privilege)
+from mediagoblin.db.extratypes import JSONEncoded, MutationDict
 
 MIGRATIONS = {}
 
@@ -720,3 +721,15 @@ def drop_MediaEntry_collected(db):
     media_collected.drop()
 
     db.commit()
+
+@RegisterMigration(20, MIGRATIONS)
+def add_metadata_column(db):
+    metadata = MetaData(bind=db.bind)
+
+    media_entry = inspect_table(metadata, 'core__media_entries')
+
+    col = Column('media_metadata', MutationDict.as_mutable(JSONEncoded),
+        default=MutationDict())
+    col.create(media_entry)
+
+    db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index b750375d..8499ea3f 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -264,6 +264,8 @@ class MediaEntry(Base, MediaEntryMixin):
         cascade="all, delete-orphan"
         )
     collections = association_proxy("collections_helper", "in_collection")
+    media_metadata = Column(MutationDict.as_mutable(JSONEncoded),
+        default=MutationDict())
 
     ## TODO
     # fail_error