aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-24 18:12:38 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-28 22:58:32 +0100
commitc6263400cfd334a820122bd1b22eaa4d4d6765cd (patch)
tree0a257a47fbf8e304a568560c6f4b50cc5452ffe8
parent19ed039ba6d65cecfd6e8ad6e47b5cb008350b04 (diff)
downloadmediagoblin-c6263400cfd334a820122bd1b22eaa4d4d6765cd.tar.lz
mediagoblin-c6263400cfd334a820122bd1b22eaa4d4d6765cd.tar.xz
mediagoblin-c6263400cfd334a820122bd1b22eaa4d4d6765cd.zip
SQL Model: Forgot MediaEntry.state field
While creating the new SQL model, the "state" field of MediaEntry was left out. Currently using a plain unicode string for it. Maybe should use sqlalchemy.types.Enum?
-rw-r--r--mediagoblin/db/sql/convert.py2
-rw-r--r--mediagoblin/db/sql/models.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 6de758ed..c6bed1e9 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -62,7 +62,7 @@ def convert_media_entries(mk_db):
copy_attrs(entry, new_entry,
('title', 'slug', 'created',
'description', 'description_html',
- 'media_type',
+ 'media_type', 'state',
'fail_error',
'queued_task_id',))
copy_reference_attr(entry, new_entry, "uploader")
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index 68b078a5..268f5715 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -58,6 +58,7 @@ class MediaEntry(Base):
description = Column(UnicodeText) # ??
description_html = Column(UnicodeText) # ??
media_type = Column(Unicode, nullable=False)
+ state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum?
fail_error = Column(Unicode)
fail_metadata = Column(UnicodeText)