ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/db: fix mappings

Browse source 
Post notes had mixed up column types. I fixed that and at the same time,
I took the opportunity to convert everything into Unicode. Also, I've
changed existing migrations rather than creating new ones - it's not
like we're even close to alpha...
This commit is contained in:
rr- 2016-05-08 22:18:13 +02:00
parent 339c9a3333
commit 2330cf017d
14 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/szurubooru/db/comment.py
View file

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, DateTime, Text, ForeignKey from sqlalchemy import Column, Integer, DateTime, UnicodeText, ForeignKey
from sqlalchemy.orm import relationship, object_session from sqlalchemy.orm import relationship, object_session
from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import func
from szurubooru.db.base import Base from szurubooru.db.base import Base
@ -22,7 +22,7 @@ class Comment(Base):
user_id = Column('user_id', Integer, ForeignKey('user.id')) user_id = Column('user_id', Integer, ForeignKey('user.id'))
creation_time = Column('creation_time', DateTime, nullable=False) creation_time = Column('creation_time', DateTime, nullable=False)
last_edit_time = Column('last_edit_time', DateTime) last_edit_time = Column('last_edit_time', DateTime)
text = Column('text', Text, default=None) text = Column('text', UnicodeText, default=None)
user = relationship('User') user = relationship('User')
post = relationship('Post') post = relationship('Post')

20
server/szurubooru/db/post.py
View file

@ -1,4 +1,5 @@
from sqlalchemy import Column, Integer, DateTime, String, Text, PickleType, ForeignKey from sqlalchemy import (
Column, Integer, DateTime, Unicode, UnicodeText, PickleType, ForeignKey)
from sqlalchemy.orm import relationship, column_property, object_session from sqlalchemy.orm import relationship, column_property, object_session
from sqlalchemy.sql.expression import func, select from sqlalchemy.sql.expression import func, select
from szurubooru.db.base import Base from szurubooru.db.base import Base
@ -42,7 +43,7 @@ class PostNote(Base):
post_note_id = Column('id', Integer, primary_key=True) post_note_id = Column('id', Integer, primary_key=True)
post_id = Column('post_id', Integer, ForeignKey('post.id'), nullable=False) post_id = Column('post_id', Integer, ForeignKey('post.id'), nullable=False)
polygon = Column('polygon', PickleType, nullable=False) polygon = Column('polygon', PickleType, nullable=False)
text = Column('text', Text, nullable=False) text = Column('text', UnicodeText, nullable=False)
post = relationship('Post') post = relationship('Post')
@ -62,9 +63,9 @@ class PostTag(Base):
post_id = Column('post_id', Integer, ForeignKey('post.id'), primary_key=True) post_id = Column('post_id', Integer, ForeignKey('post.id'), primary_key=True)
tag_id = Column('tag_id', Integer, ForeignKey('tag.id'), primary_key=True) tag_id = Column('tag_id', Integer, ForeignKey('tag.id'), primary_key=True)
def __init__(self, tag_id, post_id): def __init__(self, post_id, tag_id):
self.tag_id = tag_id
self.post_id = post_id self.post_id = post_id
self.tag_id = tag_id
class Post(Base): class Post(Base):
__tablename__ = 'post' __tablename__ = 'post'
@ -72,6 +73,7 @@ class Post(Base):
SAFETY_SAFE = 'safe' SAFETY_SAFE = 'safe'
SAFETY_SKETCHY = 'sketchy' SAFETY_SKETCHY = 'sketchy'
SAFETY_UNSAFE = 'unsafe' SAFETY_UNSAFE = 'unsafe'
TYPE_IMAGE = 'image' TYPE_IMAGE = 'image'
TYPE_ANIMATION = 'animation' TYPE_ANIMATION = 'animation'
TYPE_VIDEO = 'video' TYPE_VIDEO = 'video'
@ -82,17 +84,17 @@ class Post(Base):
user_id = Column('user_id', Integer, ForeignKey('user.id')) user_id = Column('user_id', Integer, ForeignKey('user.id'))
creation_time = Column('creation_time', DateTime, nullable=False) creation_time = Column('creation_time', DateTime, nullable=False)
last_edit_time = Column('last_edit_time', DateTime) last_edit_time = Column('last_edit_time', DateTime)
safety = Column('safety', String(32), nullable=False) safety = Column('safety', Unicode(32), nullable=False)
source = Column('source', String(200)) source = Column('source', Unicode(200))
flags = Column('flags', PickleType, default=None) flags = Column('flags', PickleType, default=None)
# content description # content description
type = Column('type', String(32), nullable=False) type = Column('type', Unicode(32), nullable=False)
checksum = Column('checksum', String(64), nullable=False) checksum = Column('checksum', Unicode(64), nullable=False)
file_size = Column('file_size', Integer) file_size = Column('file_size', Integer)
canvas_width = Column('image_width', Integer) canvas_width = Column('image_width', Integer)
canvas_height = Column('image_height', Integer) canvas_height = Column('image_height', Integer)
mime_type = Column('mime-type', String(32), nullable=False) mime_type = Column('mime-type', Unicode(32), nullable=False)
# foreign tables # foreign tables
user = relationship('User') user = relationship('User')

8
server/szurubooru/db/snapshot.py
View file

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, DateTime, String, PickleType, ForeignKey from sqlalchemy import Column, Integer, DateTime, Unicode, PickleType, ForeignKey
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from szurubooru.db.base import Base from szurubooru.db.base import Base
@ -11,10 +11,10 @@ class Snapshot(Base):
snapshot_id = Column('id', Integer, primary_key=True) snapshot_id = Column('id', Integer, primary_key=True)
creation_time = Column('creation_time', DateTime, nullable=False) creation_time = Column('creation_time', DateTime, nullable=False)
resource_type = Column('resource_type', String(32), nullable=False) resource_type = Column('resource_type', Unicode(32), nullable=False)
resource_id = Column('resource_id', Integer, nullable=False) resource_id = Column('resource_id', Integer, nullable=False)
resource_repr = Column('resource_repr', String(64), nullable=False) resource_repr = Column('resource_repr', Unicode(64), nullable=False)
operation = Column('operation', String(16), nullable=False) operation = Column('operation', Unicode(16), nullable=False)
user_id = Column('user_id', Integer, ForeignKey('user.id')) user_id = Column('user_id', Integer, ForeignKey('user.id'))
data = Column('data', PickleType) data = Column('data', PickleType)

4
server/szurubooru/db/tag.py
View file

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, DateTime, String, ForeignKey from sqlalchemy import Column, Integer, DateTime, Unicode, ForeignKey
from sqlalchemy.orm import relationship, column_property from sqlalchemy.orm import relationship, column_property
from sqlalchemy.sql.expression import func, select from sqlalchemy.sql.expression import func, select
from szurubooru.db.base import Base from szurubooru.db.base import Base
@ -33,7 +33,7 @@ class TagName(Base):
tag_name_id = Column('tag_name_id', Integer, primary_key=True) tag_name_id = Column('tag_name_id', Integer, primary_key=True)
tag_id = Column('tag_id', Integer, ForeignKey('tag.id'), nullable=False) tag_id = Column('tag_id', Integer, ForeignKey('tag.id'), nullable=False)
name = Column('name', String(64), nullable=False, unique=True) name = Column('name', Unicode(64), nullable=False, unique=True)
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name

6
server/szurubooru/db/tag_category.py
View file

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, String, table from sqlalchemy import Column, Integer, Unicode, table
from sqlalchemy.orm import column_property from sqlalchemy.orm import column_property
from sqlalchemy.sql.expression import func, select from sqlalchemy.sql.expression import func, select
from szurubooru.db.base import Base from szurubooru.db.base import Base
@ -8,8 +8,8 @@ class TagCategory(Base):
__tablename__ = 'tag_category' __tablename__ = 'tag_category'
tag_category_id = Column('id', Integer, primary_key=True) tag_category_id = Column('id', Integer, primary_key=True)
name = Column('name', String(32), nullable=False) name = Column('name', Unicode(32), nullable=False)
color = Column('color', String(32), nullable=False, default='#000000') color = Column('color', Unicode(32), nullable=False, default='#000000')
def __init__(self, name=None): def __init__(self, name=None):
self.name = name self.name = name

14
server/szurubooru/db/user.py
View file

@ -1,4 +1,4 @@
from sqlalchemy import Column, Integer, String, DateTime from sqlalchemy import Column, Integer, Unicode, DateTime
from szurubooru.db.base import Base from szurubooru.db.base import Base
class User(Base): class User(Base):
@ -25,12 +25,12 @@ class User(Base):
] ]
user_id = Column('id', Integer, primary_key=True) user_id = Column('id', Integer, primary_key=True)
name = Column('name', String(50), nullable=False, unique=True) name = Column('name', Unicode(50), nullable=False, unique=True)
password_hash = Column('password_hash', String(64), nullable=False) password_hash = Column('password_hash', Unicode(64), nullable=False)
password_salt = Column('password_salt', String(32)) password_salt = Column('password_salt', Unicode(32))
email = Column('email', String(64), nullable=True) email = Column('email', Unicode(64), nullable=True)
rank = Column('rank', String(32), nullable=False) rank = Column('rank', Unicode(32), nullable=False)
creation_time = Column('creation_time', DateTime, nullable=False) creation_time = Column('creation_time', DateTime, nullable=False)
last_login_time = Column('last_login_time', DateTime) last_login_time = Column('last_login_time', DateTime)
avatar_style = Column( avatar_style = Column(
'avatar_style', String(32), nullable=False, default=AVATAR_GRAVATAR) 'avatar_style', Unicode(32), nullable=False, default=AVATAR_GRAVATAR)

6
server/szurubooru/migrations/versions/00cb3a2734db_create_tag_tables.py
View file

@ -17,8 +17,8 @@ def upgrade():
op.create_table( op.create_table(
'tag_category', 'tag_category',
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=32), nullable=False), sa.Column('name', sa.Unicode(length=32), nullable=False),
sa.Column('color', sa.String(length=32), nullable=False), sa.Column('color', sa.Unicode(length=32), nullable=False),
sa.PrimaryKeyConstraint('id')) sa.PrimaryKeyConstraint('id'))
op.create_table( op.create_table(
@ -34,7 +34,7 @@ def upgrade():
'tag_name', 'tag_name',
sa.Column('tag_name_id', sa.Integer(), nullable=False), sa.Column('tag_name_id', sa.Integer(), nullable=False),
sa.Column('tag_id', sa.Integer(), nullable=False), sa.Column('tag_id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=64), nullable=False), sa.Column('name', sa.Unicode(length=64), nullable=False),
sa.ForeignKeyConstraint(['tag_id'], ['tag.id']), sa.ForeignKeyConstraint(['tag_id'], ['tag.id']),
sa.PrimaryKeyConstraint('tag_name_id'), sa.PrimaryKeyConstraint('tag_name_id'),
sa.UniqueConstraint('name')) sa.UniqueConstraint('name'))

2
server/szurubooru/migrations/versions/23abaf4a0a4b_add_mime_type_to_posts.py
View file

@ -14,7 +14,7 @@ branch_labels = None
depends_on = None depends_on = None
def upgrade(): def upgrade():
op.add_column('post', sa.Column('mime-type', sa.String(length=32), nullable=False)) op.add_column('post', sa.Column('mime-type', sa.Unicode(length=32), nullable=False))
def downgrade(): def downgrade():
op.drop_column('post', 'mime-type') op.drop_column('post', 'mime-type')

8
server/szurubooru/migrations/versions/336a76ec1338_create_post_tables.py
View file

@ -20,10 +20,10 @@ def upgrade():
sa.Column('user_id', sa.Integer(), nullable=True), sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('creation_time', sa.DateTime(), nullable=False), sa.Column('creation_time', sa.DateTime(), nullable=False),
sa.Column('last_edit_time', sa.DateTime(), nullable=True), sa.Column('last_edit_time', sa.DateTime(), nullable=True),
sa.Column('safety', sa.String(length=32), nullable=False), sa.Column('safety', sa.Unicode(length=32), nullable=False),
sa.Column('type', sa.String(length=32), nullable=False), sa.Column('type', sa.Unicode(length=32), nullable=False),
sa.Column('checksum', sa.String(length=64), nullable=False), sa.Column('checksum', sa.Unicode(length=64), nullable=False),
sa.Column('source', sa.String(length=200), nullable=True), sa.Column('source', sa.Unicode(length=200), nullable=True),
sa.Column('file_size', sa.Integer(), nullable=True), sa.Column('file_size', sa.Integer(), nullable=True),
sa.Column('image_width', sa.Integer(), nullable=True), sa.Column('image_width', sa.Integer(), nullable=True),
sa.Column('image_height', sa.Integer(), nullable=True), sa.Column('image_height', sa.Integer(), nullable=True),

2
server/szurubooru/migrations/versions/46cd5229839b_add_snapshot_resource_repr.py
View file

@ -16,7 +16,7 @@ depends_on = None
def upgrade(): def upgrade():
op.add_column( op.add_column(
'snapshot', 'snapshot',
sa.Column('resource_repr', sa.String(length=64), nullable=False)) sa.Column('resource_repr', sa.Unicode(length=64), nullable=False))
def downgrade(): def downgrade():
op.drop_column('snapshot', 'resource_repr') op.drop_column('snapshot', 'resource_repr')

2
server/szurubooru/migrations/versions/46df355634dc_add_comment_tables.py
View file

@ -21,7 +21,7 @@ def upgrade():
sa.Column('post_id', sa.Integer(), nullable=False), sa.Column('post_id', sa.Integer(), nullable=False),
sa.Column('creation_time', sa.DateTime(), nullable=False), sa.Column('creation_time', sa.DateTime(), nullable=False),
sa.Column('last_edit_time', sa.DateTime(), nullable=True), sa.Column('last_edit_time', sa.DateTime(), nullable=True),
sa.Column('text', sa.Text(), nullable=True), sa.Column('text', sa.UnicodeText(), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id']), sa.ForeignKeyConstraint(['user_id'], ['user.id']),
sa.ForeignKeyConstraint(['post_id'], ['post.id']), sa.ForeignKeyConstraint(['post_id'], ['post.id']),
sa.PrimaryKeyConstraint('id')) sa.PrimaryKeyConstraint('id'))

4
server/szurubooru/migrations/versions/565e01e3cf6d_create_snapshot_table.py
View file

@ -18,9 +18,9 @@ def upgrade():
'snapshot', 'snapshot',
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('creation_time', sa.DateTime(), nullable=False), sa.Column('creation_time', sa.DateTime(), nullable=False),
sa.Column('resource_type', sa.String(length=32), nullable=False), sa.Column('resource_type', sa.Unicode(length=32), nullable=False),
sa.Column('resource_id', sa.Integer(), nullable=False), sa.Column('resource_id', sa.Integer(), nullable=False),
sa.Column('operation', sa.String(length=16), nullable=False), sa.Column('operation', sa.Unicode(length=16), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=True), sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('data', sa.PickleType(), nullable=True), sa.Column('data', sa.PickleType(), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.id']), sa.ForeignKeyConstraint(['user_id'], ['user.id']),

4
server/szurubooru/migrations/versions/9587de88a84b_create_aux_post_tables.py
View file

@ -37,8 +37,8 @@ def upgrade():
'post_note', 'post_note',
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('post_id', sa.Integer(), nullable=False), sa.Column('post_id', sa.Integer(), nullable=False),
sa.Column('text', sa.PickleType(), nullable=False), sa.Column('text', sa.UnicodeText(), nullable=False),
sa.Column('polygon', sa.Text(), nullable=False), sa.Column('polygon', sa.PickleType(), nullable=False),
sa.ForeignKeyConstraint(['post_id'], ['post.id']), sa.ForeignKeyConstraint(['post_id'], ['post.id']),
sa.PrimaryKeyConstraint('id')) sa.PrimaryKeyConstraint('id'))

12
server/szurubooru/migrations/versions/e5c1216a8503_create_user_table.py
View file

@ -17,14 +17,14 @@ def upgrade():
op.create_table( op.create_table(
'user', 'user',
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=50), nullable=False), sa.Column('name', sa.Unicode(length=50), nullable=False),
sa.Column('password_hash', sa.String(length=64), nullable=False), sa.Column('password_hash', sa.Unicode(length=64), nullable=False),
sa.Column('password_salt', sa.String(length=32), nullable=True), sa.Column('password_salt', sa.Unicode(length=32), nullable=True),
sa.Column('email', sa.String(length=64), nullable=True), sa.Column('email', sa.Unicode(length=64), nullable=True),
sa.Column('rank', sa.String(length=32), nullable=False), sa.Column('rank', sa.Unicode(length=32), nullable=False),
sa.Column('creation_time', sa.DateTime(), nullable=False), sa.Column('creation_time', sa.DateTime(), nullable=False),
sa.Column('last_login_time', sa.DateTime()), sa.Column('last_login_time', sa.DateTime()),
sa.Column('avatar_style', sa.String(length=32), nullable=False), sa.Column('avatar_style', sa.Unicode(length=32), nullable=False),
sa.PrimaryKeyConstraint('id')) sa.PrimaryKeyConstraint('id'))
op.create_unique_constraint('uq_user_name', 'user', ['name']) op.create_unique_constraint('uq_user_name', 'user', ['name'])