diff options
| -rw-r--r-- | mediagoblin/db/migrations.py | 4 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 423508f6..a88518f4 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -26,7 +26,7 @@ from sqlalchemy.sql import and_ from migrate.changeset.constraint import UniqueConstraint -from mediagoblin.db.extratypes import JSONEncoded, MutationDict +from mediagoblin.db.extratypes import JSONEncoded from mediagoblin.db.migration_tools import RegisterMigration, inspect_table from mediagoblin.db.models import MediaEntry, Collection, User, MediaComment @@ -502,7 +502,7 @@ def add_file_metadata(db): metadata = MetaData(bind=db.bind) media_file_table = inspect_table(metadata, "core__mediafiles") - col = Column('file_metadata', MutationDict.as_mutable(JSONEncoded)) + col = Column('file_metadata', JSONEncoded) col.create(media_file_table) db.commit() diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 10558c5f..a1328370 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -48,6 +48,8 @@ from migrate import changeset _log = logging.getLogger(__name__) +MutationDict.associate_with(JSONEncoded) + class User(Base, UserMixin): """ @@ -393,7 +395,7 @@ class MediaFile(Base): nullable=False) name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) file_path = Column(PathTupleWithSlashes) - file_metadata = Column(MutationDict.as_mutable(JSONEncoded)) + file_metadata = Column(JSONEncoded) __table_args__ = ( PrimaryKeyConstraint('media_entry', 'name_id'), |