aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/db/migrations.py2
-rw-r--r--mediagoblin/db/models.py2
2 files changed, 2 insertions, 2 deletions
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