aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/db/sql/convert.py4
-rw-r--r--mediagoblin/db/sql/models_v0.py20
2 files changed, 23 insertions, 1 deletions
diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 0690fa4c..2a8734f9 100644
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -23,7 +23,7 @@ from mediagoblin.db.sql.base import Session
from mediagoblin.db.sql.models_v0 import Base_v0
from mediagoblin.db.sql.models_v0 import (User, MediaEntry, MediaComment,
Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData,
- ImageData, VideoData)
+ ImageData, VideoData, AsciiData, AudioData)
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 \
@@ -195,6 +195,8 @@ def convert_media_comments(mk_db):
media_types_tables = (
("mediagoblin.media_types.image", (ImageData,)),
("mediagoblin.media_types.video", (VideoData,)),
+ ("mediagoblin.media_types.ascii", (AsciiData,)),
+ ("mediagoblin.media_types.audio", (AudioData,)),
)
diff --git a/mediagoblin/db/sql/models_v0.py b/mediagoblin/db/sql/models_v0.py
index 5dd6b38b..06f87d28 100644
--- a/mediagoblin/db/sql/models_v0.py
+++ b/mediagoblin/db/sql/models_v0.py
@@ -284,6 +284,26 @@ class VideoData(Base_v0):
height = Column(SmallInteger)
+class AsciiData(Base_v0):
+ __tablename__ = "ascii__mediadata"
+
+ # The primary key *and* reference to the main media_entry
+ media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
+ primary_key=True)
+ get_media_entry = relationship("MediaEntry",
+ backref=backref("ascii__media_data", cascade="all, delete-orphan"))
+
+
+class AudioData(Base_v0):
+ __tablename__ = "audio__mediadata"
+
+ # The primary key *and* reference to the main media_entry
+ media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
+ primary_key=True)
+ get_media_entry = relationship("MediaEntry",
+ backref=backref("audio__media_data", cascade="all, delete-orphan"))
+
+
######################################################
# Special, migrations-tracking table
#