SQL: Improve video media_data table

1. Make the foreignkey the primary_key.
2. Add width/height, as those are currently in use for the
   media_data

diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 797179137c97daa73deb036cb4fb8f29ed4a9ae2..250c559bdb56b219cdc4058a3a1ec2b6e68ba8cd 100644 (file)
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -20,6 +20,7 @@ from mediagoblin.db.mongo.util import ObjectId
 
 from mediagoblin.db.sql.models import (Base, User, MediaEntry, MediaComment,
     Tag, MediaTag, MediaFile, MediaAttachmentFile)
+from mediagoblin.media_types.video.models import VideoData
 from mediagoblin.db.sql.open import setup_connection_and_db_from_config as \
     sql_connect
 from mediagoblin.db.mongo.open import setup_connection_and_db_from_config as \

diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py
index 741c329b12c8da726a3b40beb6e18a031be96c36..709d79107f434a309b8b8722665e022a0de5805f 100644 (file)
--- a/mediagoblin/media_types/video/models.py
+++ b/mediagoblin/media_types/video/models.py
@@ -18,16 +18,17 @@
 from mediagoblin.db.sql.models import Base
 
 from sqlalchemy import (
-    Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
-    UniqueConstraint)
+    Column, Integer, SmallInteger, ForeignKey)
 
 
 class VideoData(Base):
     __tablename__ = "video_data"
 
-    id = Column(Integer, primary_key=True)
-    media_entry = Column(
-        Integer, ForeignKey('media_entries.id'), nullable=False)
+    # The primary key *and* reference to the main media_entry
+    media_entry = Column(Integer, ForeignKey('media_entries.id'),
+        primary_key=True)
+    width = Column(SmallInteger)
+    height = Column(SmallInteger)
 
 
 DATA_MODEL = VideoData