diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-09-19 08:02:30 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-09-19 08:12:11 -0700 |
| commit | 42dbb26a13190cb1fcd1723367e8811eff6d8d25 (patch) | |
| tree | 4a3c2502c14ab75dc734dcd08c462a1c625bfebb /mediagoblin/db | |
| parent | 4c617543c54d8aa249033f99982e786e4346264d (diff) | |
| download | mediagoblin-42dbb26a13190cb1fcd1723367e8811eff6d8d25.tar.lz mediagoblin-42dbb26a13190cb1fcd1723367e8811eff6d8d25.tar.xz mediagoblin-42dbb26a13190cb1fcd1723367e8811eff6d8d25.zip | |
not all JSONEncoded fields should be mutable dicts
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/migrations.py | 4 | ||||
| -rw-r--r-- | mediagoblin/db/models.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index a88518f4..423508f6 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 +from mediagoblin.db.extratypes import JSONEncoded, MutationDict 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', JSONEncoded) + col = Column('file_metadata', MutationDict.as_mutable(JSONEncoded)) col.create(media_file_table) db.commit() diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index a1328370..5e8b6641 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -48,7 +48,6 @@ from migrate import changeset _log = logging.getLogger(__name__) -MutationDict.associate_with(JSONEncoded) class User(Base, UserMixin): @@ -395,7 +394,7 @@ class MediaFile(Base): nullable=False) name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) file_path = Column(PathTupleWithSlashes) - file_metadata = Column(JSONEncoded) + file_metadata = Column(MutationDict.as_mutable(JSONEncoded)) __table_args__ = ( PrimaryKeyConstraint('media_entry', 'name_id'), |