aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
authortilly-Q <nattilypigeonfowl@gmail.com>2014-05-14 11:56:59 -0400
committertilly-Q <nattilypigeonfowl@gmail.com>2014-05-14 11:56:59 -0400
commitc8abeb58afd36c56af705a69a2d3ebec90002e74 (patch)
treee4edce61b85877354255331ab9e749789e99715b /mediagoblin
parent0d6550fb05c25e230706c719e3a476d1b1e670b9 (diff)
downloadmediagoblin-c8abeb58afd36c56af705a69a2d3ebec90002e74.tar.lz
mediagoblin-c8abeb58afd36c56af705a69a2d3ebec90002e74.tar.xz
mediagoblin-c8abeb58afd36c56af705a69a2d3ebec90002e74.zip
Set a default value to MediaEntry.media_metadata
Diffstat (limited to 'mediagoblin')
-rw-r--r--mediagoblin/db/migrations.py3
-rw-r--r--mediagoblin/db/models.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 8dac3214..dd69ad6e 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -728,7 +728,8 @@ def add_metadata_column(db):
media_entry = inspect_table(metadata, 'core__media_entries')
- col = Column('media_metadata', MutationDict.as_mutable(JSONEncoded))
+ 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 defa0849..8499ea3f 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -264,7 +264,8 @@ class MediaEntry(Base, MediaEntryMixin):
cascade="all, delete-orphan"
)
collections = association_proxy("collections_helper", "in_collection")
- media_metadata = Column(MutationDict.as_mutable(JSONEncoded))
+ media_metadata = Column(MutationDict.as_mutable(JSONEncoded),
+ default=MutationDict())
## TODO
# fail_error