Changed the name of the metadata column

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 294ab43b94878a44345a6514044de8a811805438..8dac321488e277f2f24e68fe24ad78841bfd54a8 100644 (file)
--- 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 7c0f0bf345195d07dcb747a3db23a889dd96d4ae..defa08492987a3647ffe97ed4e9eddd515405166 100644 (file)
--- 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