diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-01 15:52:17 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-01 22:02:35 +0100 |
| commit | 1f268deda4af36d9547effd890c11e6005d4877f (patch) | |
| tree | 220b73ac444c8e02e71e60521d8b3b7df50f54c6 | |
| parent | 57f8d263e1773be7458f09f9b3f1b7571cb0e026 (diff) | |
| download | mediagoblin-1f268deda4af36d9547effd890c11e6005d4877f.tar.lz mediagoblin-1f268deda4af36d9547effd890c11e6005d4877f.tar.xz mediagoblin-1f268deda4af36d9547effd890c11e6005d4877f.zip | |
Turn media.{backref_nam} from a list to a scalar.
For all our media_types, let the backref on the media_entry
be a scalar (there is only one media_data per media_entry)
instead of a list with zero or one entry.
The media_data toolchain on MediaEntry currently handles
both transparently.
| -rw-r--r-- | mediagoblin/media_types/ascii/models.py | 3 | ||||
| -rw-r--r-- | mediagoblin/media_types/audio/models.py | 3 | ||||
| -rw-r--r-- | mediagoblin/media_types/image/models.py | 3 | ||||
| -rw-r--r-- | mediagoblin/media_types/stl/models.py | 3 | ||||
| -rw-r--r-- | mediagoblin/media_types/video/models.py | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py index 3416993c..c7505292 100644 --- a/mediagoblin/media_types/ascii/models.py +++ b/mediagoblin/media_types/ascii/models.py @@ -32,7 +32,8 @@ class AsciiData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) DATA_MODEL = AsciiData diff --git a/mediagoblin/media_types/audio/models.py b/mediagoblin/media_types/audio/models.py index 368ab1eb..d01367d5 100644 --- a/mediagoblin/media_types/audio/models.py +++ b/mediagoblin/media_types/audio/models.py @@ -32,7 +32,8 @@ class AudioData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) DATA_MODEL = AudioData diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py index 63d80aa8..b2ea3960 100644 --- a/mediagoblin/media_types/image/models.py +++ b/mediagoblin/media_types/image/models.py @@ -33,7 +33,8 @@ class ImageData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + 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 17091f0e..ff50e9c0 100644 --- a/mediagoblin/media_types/stl/models.py +++ b/mediagoblin/media_types/stl/models.py @@ -32,7 +32,8 @@ class StlData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + 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 645ef4d3..a771352c 100644 --- a/mediagoblin/media_types/video/models.py +++ b/mediagoblin/media_types/video/models.py @@ -32,7 +32,8 @@ class VideoData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) width = Column(SmallInteger) height = Column(SmallInteger) |