(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.

diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py
index 865c216c5bddc1a4f81eded38b1d06e83fb49ada..60420fdd486baa01f9397a7d8d7c56a8befb3469 100644 (file)
--- 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 5f18d2c26fe51fc54b2af2fa2c882f0bf6f772a9..08a90f5416f47535b02ebb31726c058f0b7444b7 100644 (file)
--- 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 fc518daa752387767fdc03e792ceb80e3a38b978..f54a0762d29f3650cc43381882336c599acc7015 100644 (file)
--- 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 ccb1b9dc9cf2303c696af2198de7a6ed8dafc28e..0ed4a2e508185247b621e444895f317a573f7ab5 100644 (file)
--- 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 35ed92bf72957ff50776312ee77c14e7afb30fdb..4e02cb9aa64b324dc55f8e11db1ff3265d4a7384 100644 (file)
--- 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)