From: tilly-Q <nattilypigeonfowl@gmail.com>
Date: Tue, 15 Apr 2014 18:17:43 +0000 (-0400)
Subject: Changed the name of the metadata column
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0bfb4089cc187113a7808eed6643a73c86bb01cb;p=mediagoblin.git

Changed the name of the metadata column
---

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 294ab43b..8dac3214 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -728,7 +728,7 @@ def add_metadata_column(db):
 
     media_entry = inspect_table(metadata, 'core__media_entries')
 
-    col = Column('metadata', MutationDict.as_mutable(JSONEncoded))
+    col = Column('media_metadata', MutationDict.as_mutable(JSONEncoded))
     col.create(media_entry)
 
     db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 7c0f0bf3..defa0849 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -264,7 +264,7 @@ class MediaEntry(Base, MediaEntryMixin):
         cascade="all, delete-orphan"
         )
     collections = association_proxy("collections_helper", "in_collection")
-    metadata = Column(MutationDict.as_mutable(JSONEncoded))
+    media_metadata = Column(MutationDict.as_mutable(JSONEncoded))
 
     ## TODO
     # fail_error