heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

not all JSONEncoded fields should be mutable dicts

Browse Source
This commit is contained in:
Rodney Ewing 2013-09-19 08:02:30 -07:00
parent 4c617543c5
commit 42dbb26a13
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/db/migrations.py
View File

@ -26,7 +26,7 @@ from sqlalchemy.sql import and_
from migrate.changeset.constraint import UniqueConstraint 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.migration_tools import RegisterMigration, inspect_table
from mediagoblin.db.models import MediaEntry, Collection, User, MediaComment from mediagoblin.db.models import MediaEntry, Collection, User, MediaComment
@ -502,7 +502,7 @@ def add_file_metadata(db):
metadata = MetaData(bind=db.bind) metadata = MetaData(bind=db.bind)
media_file_table = inspect_table(metadata, "core__mediafiles") 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) col.create(media_file_table)
db.commit() db.commit()

3
mediagoblin/db/models.py
View File

@ -48,7 +48,6 @@ from migrate import changeset
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
MutationDict.associate_with(JSONEncoded)
class User(Base, UserMixin): class User(Base, UserMixin):
@ -395,7 +394,7 @@ class MediaFile(Base):
nullable=False) nullable=False)
name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False)
file_path = Column(PathTupleWithSlashes) file_path = Column(PathTupleWithSlashes)
file_metadata = Column(JSONEncoded) file_metadata = Column(MutationDict.as_mutable(JSONEncoded))
__table_args__ = ( __table_args__ = (
PrimaryKeyConstraint('media_entry', 'name_id'), PrimaryKeyConstraint('media_entry', 'name_id'),