aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/models.py
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-05-14 13:02:30 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-05-14 13:02:30 -0400
commitda537ed44ef855954696a18dccd832feb6e56328 (patch)
tree9eaa78895c0faeff2fb05d37e687e59fbc5f9e8f /mediagoblin/db/models.py
parent03766fd87069cb4f1394790f81ac7b853085bf71 (diff)
parent2daf8ec00043a4cc5cd120f875a5382aca6ec7f9 (diff)
downloadmediagoblin-da537ed44ef855954696a18dccd832feb6e56328.tar.lz
mediagoblin-da537ed44ef855954696a18dccd832feb6e56328.tar.xz
mediagoblin-da537ed44ef855954696a18dccd832feb6e56328.zip
Merge branch 'metadata'
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r--mediagoblin/db/models.py2
1 files changed, 2 insertions, 0 deletions
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