aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-17 17:36:34 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-12-24 22:52:27 +0100
commit0562898e116ffcc8ce6f811c7c05ff77035bfa96 (patch)
tree4d0103ff38872a581a9eb8cb8e976cae4b7b29ed
parentac8212fe657802eaf9dfd9d6c0f28f25b750399e (diff)
downloadmediagoblin-0562898e116ffcc8ce6f811c7c05ff77035bfa96.tar.lz
mediagoblin-0562898e116ffcc8ce6f811c7c05ff77035bfa96.tar.xz
mediagoblin-0562898e116ffcc8ce6f811c7c05ff77035bfa96.zip
(SQL) Media types: Refactor backrefnames.
We need to know the name of the backref, so that we can access it by name on the MediaEntry. We might be able to get this name by inspection, but this way is easier, for now.
-rw-r--r--mediagoblin/media_types/ascii/models.py5
-rw-r--r--mediagoblin/media_types/audio/models.py5
-rw-r--r--mediagoblin/media_types/image/models.py5
-rw-r--r--mediagoblin/media_types/stl/models.py5
-rw-r--r--mediagoblin/media_types/video/models.py5
5 files changed, 20 insertions, 5 deletions
diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py
index 865c216c..60420fdd 100644
--- a/mediagoblin/media_types/ascii/models.py
+++ b/mediagoblin/media_types/ascii/models.py
@@ -22,6 +22,9 @@ from sqlalchemy import (
from sqlalchemy.orm import relationship, backref
+BACKREF_NAME = "ascii__media_data"
+
+
class AsciiData(Base):
__tablename__ = "ascii__mediadata"
@@ -29,7 +32,7 @@ class AsciiData(Base):
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"))
+ backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
DATA_MODEL = AsciiData
diff --git a/mediagoblin/media_types/audio/models.py b/mediagoblin/media_types/audio/models.py
index 5f18d2c2..08a90f54 100644
--- a/mediagoblin/media_types/audio/models.py
+++ b/mediagoblin/media_types/audio/models.py
@@ -22,6 +22,9 @@ from sqlalchemy import (
from sqlalchemy.orm import relationship, backref
+BACKREF_NAME = "audio__media_data"
+
+
class AudioData(Base):
__tablename__ = "audio__mediadata"
@@ -29,7 +32,7 @@ class AudioData(Base):
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"))
+ backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
DATA_MODEL = AudioData
diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index fc518daa..f54a0762 100644
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -23,6 +23,9 @@ from sqlalchemy.orm import relationship, backref
from mediagoblin.db.sql.extratypes import JSONEncoded
+BACKREF_NAME = "image__media_data"
+
+
class ImageData(Base):
__tablename__ = "image__mediadata"
@@ -30,7 +33,7 @@ class ImageData(Base):
media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True)
get_media_entry = relationship("MediaEntry",
- backref=backref("image__media_data", cascade="all, delete-orphan"))
+ backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
width = Column(Integer)
height = Column(Integer)
diff --git a/mediagoblin/media_types/stl/models.py b/mediagoblin/media_types/stl/models.py
index ccb1b9dc..0ed4a2e5 100644
--- a/mediagoblin/media_types/stl/models.py
+++ b/mediagoblin/media_types/stl/models.py
@@ -22,6 +22,9 @@ from sqlalchemy import (
from sqlalchemy.orm import relationship, backref
+BACKREF_NAME = "stl__media_data"
+
+
class StlData(Base):
__tablename__ = "stl__mediadata"
@@ -29,7 +32,7 @@ class StlData(Base):
media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True)
get_media_entry = relationship("MediaEntry",
- backref=backref("stl__media_data", cascade="all, delete-orphan"))
+ backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
center_x = Column(Float)
center_y = Column(Float)
diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py
index 35ed92bf..4e02cb9a 100644
--- a/mediagoblin/media_types/video/models.py
+++ b/mediagoblin/media_types/video/models.py
@@ -22,6 +22,9 @@ from sqlalchemy import (
from sqlalchemy.orm import relationship, backref
+BACKREF_NAME = "video__media_data"
+
+
class VideoData(Base):
__tablename__ = "video__mediadata"
@@ -29,7 +32,7 @@ class VideoData(Base):
media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True)
get_media_entry = relationship("MediaEntry",
- backref=backref("video__media_data", cascade="all, delete-orphan"))
+ backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
width = Column(SmallInteger)
height = Column(SmallInteger)