1 files changed, 9 insertions, 7 deletions
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index edf3eb0d..ba28ab7b 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -91,10 +91,11 @@ class MediaEntry(Base, MediaEntryMixin):
     __tablename__ = "core__media_entries"
 
     id = Column(Integer, primary_key=True)
-    uploader = Column(Integer, ForeignKey('core__users.id'), nullable=False)
+    uploader = Column(Integer, ForeignKey(User.id), nullable=False, index=True)
     title = Column(Unicode, nullable=False)
     slug = Column(Unicode)
-    created = Column(DateTime, nullable=False, default=datetime.datetime.now)
+    created = Column(DateTime, nullable=False, default=datetime.datetime.now,
+        index=True)
     description = Column(UnicodeText) # ??
     media_type = Column(Unicode, nullable=False)
     state = Column(Unicode, default=u'unprocessed', nullable=False)
@@ -189,8 +190,9 @@ class MediaEntry(Base, MediaEntryMixin):
             media_entry=self.id).first()
 
         # No media data, so actually add a new one
-        if not media_data:
+        if media_data is None:
             media_data = self.media_data_table(
+                media_entry=self.id,
                 **kwargs)
             session.add(media_data)
         # Update old media data
@@ -292,8 +294,8 @@ class MediaTag(Base):
     id = Column(Integer, primary_key=True)
     media_entry = Column(
         Integer, ForeignKey(MediaEntry.id),
-        nullable=False)
-    tag = Column(Integer, ForeignKey('core__tags.id'), nullable=False)
+        nullable=False, index=True)
+    tag = Column(Integer, ForeignKey(Tag.id), nullable=False, index=True)
     name = Column(Unicode)
     # created = Column(DateTime, nullable=False, default=datetime.datetime.now)
 
@@ -324,8 +326,8 @@ class MediaComment(Base, MediaCommentMixin):
 
     id = Column(Integer, primary_key=True)
     media_entry = Column(
-        Integer, ForeignKey('core__media_entries.id'), nullable=False)
-    author = Column(Integer, ForeignKey('core__users.id'), nullable=False)
+        Integer, ForeignKey(MediaEntry.id), nullable=False, index=True)
+    author = Column(Integer, ForeignKey(User.id), nullable=False)
     created = Column(DateTime, nullable=False, default=datetime.datetime.now)
     content = Column(UnicodeText, nullable=False)