from copy import copy
-from mediagoblin.init import setup_global_and_app_config, setup_database
-from mediagoblin.db.mongo.util import ObjectId
-
-from mediagoblin.db.sql.base import Base, Session
-from mediagoblin.db.sql.models import (User, MediaEntry, MediaComment,
- Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData)
-from mediagoblin.media_types.image.models import ImageData
-from mediagoblin.media_types.video.models import VideoData
+from mediagoblin.init import setup_global_and_app_config
+
+from mediagoblin.db.sql.base import Session
+from mediagoblin.db.sql.models_0 import Base_v0
+from mediagoblin.db.sql.models_0 import (User, MediaEntry, MediaComment,
+ Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData,
+ ImageData, VideoData)
from mediagoblin.db.sql.open import setup_connection_and_db_from_config as \
sql_connect
from mediagoblin.db.mongo.open import setup_connection_and_db_from_config as \
sql_conn, sql_db = sql_connect(app_config)
mk_conn, mk_db = mongo_connect(app_config)
- Base.metadata.create_all(sql_db.engine)
+ Base_v0.metadata.create_all(sql_db.engine)
convert_users(mk_db)
Session.remove()
from sqlalchemy.util import memoized_property
from mediagoblin.db.sql.extratypes import PathTupleWithSlashes, JSONEncoded
-from mediagoblin.db.sql.base import Base, DictReadAttrProxy
+from mediagoblin.db.sql.base import GMGTableBase, DictReadAttrProxy
from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin
from mediagoblin.db.sql.base import Session
-# It's actually kind of annoying how sqlalchemy-migrate does this, if
-# I understand it right, but whatever. Anyway, don't remove this :P
-#
-# We could do migration calls more manually instead of relying on
-# this import-based meddling...
-from migrate import changeset
+
+Base_v0 = declarative_base(cls=GMGTableBase)
class SimpleFieldAlias(object):
setattr(instance, self.fieldname, val)
-class User(Base, UserMixin):
+class User(Base_v0, UserMixin):
"""
TODO: We should consider moving some rarely used fields
into some sort of "shadow" table.
_id = SimpleFieldAlias("id")
-class MediaEntry(Base, MediaEntryMixin):
+class MediaEntry(Base_v0, MediaEntryMixin):
"""
TODO: Consider fetching the media_files using join
"""
return sys.modules[models_module].DATA_MODEL
-class FileKeynames(Base):
+class FileKeynames(Base_v0):
"""
keywords for various places.
currently the MediaFile keys
return cls(name=name)
-class MediaFile(Base):
+class MediaFile(Base_v0):
"""
TODO: Highly consider moving "name" into a new table.
TODO: Consider preloading said table in software
)
-class MediaAttachmentFile(Base):
+class MediaAttachmentFile(Base_v0):
__tablename__ = "core__attachment_files"
id = Column(Integer, primary_key=True)
return DictReadAttrProxy(self)
-class Tag(Base):
+class Tag(Base_v0):
__tablename__ = "core__tags"
id = Column(Integer, primary_key=True)
return cls(slug=slug)
-class MediaTag(Base):
+class MediaTag(Base_v0):
__tablename__ = "core__media_tags"
id = Column(Integer, primary_key=True)
)
def __init__(self, name=None, slug=None):
- Base.__init__(self)
+ Base_v0.__init__(self)
if name is not None:
self.name = name
if slug is not None:
return DictReadAttrProxy(self)
-class MediaComment(Base, MediaCommentMixin):
+class MediaComment(Base_v0, MediaCommentMixin):
__tablename__ = "core__media_comments"
id = Column(Integer, primary_key=True)
_id = SimpleFieldAlias("id")
-MODELS = [
- User, MediaEntry, Tag, MediaTag, MediaComment, MediaFile, FileKeynames,
- MediaAttachmentFile]
+class ImageData(Base_v0):
+ __tablename__ = "image__mediadata"
+
+ # The primary key *and* reference to the main media_entry
+ 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"))
+
+ width = Column(Integer)
+ height = Column(Integer)
+ exif_all = Column(JSONEncoded)
+ gps_longitude = Column(Float)
+ gps_latitude = Column(Float)
+ gps_altitude = Column(Float)
+ gps_direction = Column(Float)
+
+
+class VideoData(Base_v0):
+ __tablename__ = "video__mediadata"
+
+ # The primary key *and* reference to the main media_entry
+ 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"))
+
+ width = Column(SmallInteger)
+ height = Column(SmallInteger)
######################################################
# really migrated, but used for migrations (for now)
######################################################
-class MigrationData(Base):
+class MigrationData(Base_v0):
__tablename__ = "core__migrations"
name = Column(Unicode, primary_key=True)
version = Column(Integer, nullable=False, default=0)
######################################################
-
-
-def show_table_init(engine_uri):
- if engine_uri is None:
- engine_uri = 'sqlite:///:memory:'
- from sqlalchemy import create_engine
- engine = create_engine(engine_uri, echo=True)
-
- Base.metadata.create_all(engine)
-
-
-if __name__ == '__main__':
- from sys import argv
- print repr(argv)
- if len(argv) == 2:
- uri = argv[1]
- else:
- uri = None
- show_table_init(uri)
projects / mediagoblin.git / commitdiff