diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-02-09 15:33:06 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-02-09 15:33:06 -0600 |
| commit | 591c11609852c5481f00bf0eaa01ceafcd244f38 (patch) | |
| tree | 306aefc938bf8c92ed52ead37798a57c56ac570b /mediagoblin/media_types | |
| parent | 742bfa7a776c7c18d2308aae7f820e7ec2895b2e (diff) | |
| parent | 485404a9c42b09f0fda38aeb8d1242f24ccfa143 (diff) | |
| download | mediagoblin-591c11609852c5481f00bf0eaa01ceafcd244f38.tar.lz mediagoblin-591c11609852c5481f00bf0eaa01ceafcd244f38.tar.xz mediagoblin-591c11609852c5481f00bf0eaa01ceafcd244f38.zip | |
Merge remote-tracking branch 'refs/remotes/elrond/sql/media_data'
Diffstat (limited to 'mediagoblin/media_types')
| -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) |