heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make mediagoblin SQL models all use a consistent table naming scheme

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-03-17 16:48:28 -05:00
parent 431811eb36
commit 2f5ce68c6c
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mediagoblin/db/sql/models.py
View File

@ -61,7 +61,7 @@ class User(Base, UserMixin):
TODO: We should consider moving some rarely used fields TODO: We should consider moving some rarely used fields
into some sort of "shadow" table. into some sort of "shadow" table.
""" """
__tablename__ = "users" __tablename__ = "core__users"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
username = Column(Unicode, nullable=False, unique=True) username = Column(Unicode, nullable=False, unique=True)
@ -87,10 +87,10 @@ class MediaEntry(Base, MediaEntryMixin):
""" """
TODO: Consider fetching the media_files using join TODO: Consider fetching the media_files using join
""" """
__tablename__ = "media_entries" __tablename__ = "core__media_entries"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
uploader = Column(Integer, ForeignKey('users.id'), nullable=False) uploader = Column(Integer, ForeignKey('core__users.id'), nullable=False)
title = Column(Unicode, nullable=False) title = Column(Unicode, nullable=False)
slug = Column(Unicode) slug = Column(Unicode)
created = Column(DateTime, nullable=False, default=datetime.datetime.now) created = Column(DateTime, nullable=False, default=datetime.datetime.now)
@ -230,7 +230,7 @@ class MediaFile(Base):
TODO: Highly consider moving "name" into a new table. TODO: Highly consider moving "name" into a new table.
TODO: Consider preloading said table in software TODO: Consider preloading said table in software
""" """
__tablename__ = "mediafiles" __tablename__ = "core__mediafiles"
media_entry = Column( media_entry = Column(
Integer, ForeignKey(MediaEntry.id), Integer, ForeignKey(MediaEntry.id),
@ -269,7 +269,7 @@ class MediaAttachmentFile(Base):
class Tag(Base): class Tag(Base):
__tablename__ = "tags" __tablename__ = "core__tags"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
slug = Column(Unicode, nullable=False, unique=True) slug = Column(Unicode, nullable=False, unique=True)
@ -286,13 +286,13 @@ class Tag(Base):
class MediaTag(Base): class MediaTag(Base):
__tablename__ = "media_tags" __tablename__ = "core__media_tags"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
media_entry = Column( media_entry = Column(
Integer, ForeignKey(MediaEntry.id), Integer, ForeignKey(MediaEntry.id),
nullable=False) nullable=False)
tag = Column(Integer, ForeignKey('tags.id'), nullable=False) tag = Column(Integer, ForeignKey('core__tags.id'), nullable=False)
name = Column(Unicode) name = Column(Unicode)
# created = Column(DateTime, nullable=False, default=datetime.datetime.now) # created = Column(DateTime, nullable=False, default=datetime.datetime.now)
@ -319,12 +319,12 @@ class MediaTag(Base):
class MediaComment(Base, MediaCommentMixin): class MediaComment(Base, MediaCommentMixin):
__tablename__ = "media_comments" __tablename__ = "core__media_comments"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
media_entry = Column( media_entry = Column(
Integer, ForeignKey('media_entries.id'), nullable=False) Integer, ForeignKey('core__media_entries.id'), nullable=False)
author = Column(Integer, ForeignKey('users.id'), nullable=False) author = Column(Integer, ForeignKey('core__users.id'), nullable=False)
created = Column(DateTime, nullable=False, default=datetime.datetime.now) created = Column(DateTime, nullable=False, default=datetime.datetime.now)
content = Column(UnicodeText, nullable=False) content = Column(UnicodeText, nullable=False)
@ -346,7 +346,7 @@ MODELS = [
###################################################### ######################################################
class MigrationData(Base): class MigrationData(Base):
__tablename__ = "migrations" __tablename__ = "core__migrations"
name = Column(Unicode, primary_key=True) name = Column(Unicode, primary_key=True)
version = Column(Integer, nullable=False, default=0) version = Column(Integer, nullable=False, default=0)

4
mediagoblin/media_types/ascii/models.py
View File

@ -23,11 +23,11 @@ from sqlalchemy import (
class AsciiData(Base): class AsciiData(Base):
__tablename__ = "ascii_data" __tablename__ = "ascii__mediadata"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
media_entry = Column( media_entry = Column(
Integer, ForeignKey('media_entries.id'), nullable=False) Integer, ForeignKey('core__media_entries.id'), nullable=False)
DATA_MODEL = AsciiData DATA_MODEL = AsciiData

4
mediagoblin/media_types/image/models.py
View File

@ -5,10 +5,10 @@ from sqlalchemy import (
class ImageData(Base): class ImageData(Base):
__tablename__ = "image_data" __tablename__ = "image__mediadata"
# The primary key *and* reference to the main media_entry # The primary key *and* reference to the main media_entry
media_entry = Column(Integer, ForeignKey('media_entries.id'), media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True) primary_key=True)
width = Column(Integer) width = Column(Integer)
height = Column(Integer) height = Column(Integer)

4
mediagoblin/media_types/video/models.py
View File

@ -22,10 +22,10 @@ from sqlalchemy import (
class VideoData(Base): class VideoData(Base):
__tablename__ = "video_data" __tablename__ = "video__mediadata"
# The primary key *and* reference to the main media_entry # The primary key *and* reference to the main media_entry
media_entry = Column(Integer, ForeignKey('media_entries.id'), media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
primary_key=True) primary_key=True)
width = Column(SmallInteger) width = Column(SmallInteger)
height = Column(SmallInteger) height = Column(SmallInteger)