From 8ef6e915daab83c6d3590035dda3a5562cea1b0a Mon Sep 17 00:00:00 2001 From: nyaadev Date: Tue, 23 May 2017 00:36:53 +0200 Subject: [PATCH] shameful late edit: change comment text collation to utf8mb4 --- migrations/versions/d0eeb8049623_add_comments.py | 4 ++-- nyaa/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migrations/versions/d0eeb8049623_add_comments.py b/migrations/versions/d0eeb8049623_add_comments.py index 4b8599a..f6fab5b 100644 --- a/migrations/versions/d0eeb8049623_add_comments.py +++ b/migrations/versions/d0eeb8049623_add_comments.py @@ -23,7 +23,7 @@ def upgrade(): sa.Column('torrent_id', sa.Integer(), nullable=False), sa.Column('user_id', sa.Integer(), nullable=True), sa.Column('created_time', sa.DateTime(), nullable=True), - sa.Column('text', sa.String(length=255), nullable=False), + sa.Column('text', sa.String(length=255, collation='utf8mb4_bin'), nullable=False), sa.ForeignKeyConstraint(['torrent_id'], ['nyaa_torrents.id'], ondelete='CASCADE'), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('id') @@ -33,7 +33,7 @@ def upgrade(): sa.Column('torrent_id', sa.Integer(), nullable=False), sa.Column('user_id', sa.Integer(), nullable=True), sa.Column('created_time', sa.DateTime(), nullable=True), - sa.Column('text', sa.String(length=255), nullable=False), + sa.Column('text', sa.String(length=255, collation='utf8mb4_bin'), nullable=False), sa.ForeignKeyConstraint(['torrent_id'], ['sukebei_torrents.id'], ondelete='CASCADE'), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'), sa.PrimaryKeyConstraint('id') diff --git a/nyaa/models.py b/nyaa/models.py index e623aa8..aed2f6a 100644 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -329,7 +329,7 @@ class Comment(db.Model): DB_TABLE_PREFIX + 'torrents.id', ondelete='CASCADE'), nullable=False) user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE')) created_time = db.Column(db.DateTime(timezone=False), default=datetime.utcnow) - text = db.Column(db.String(length=255), nullable=False) + text = db.Column(db.String(length=255, collation=COL_UTF8MB4_BIN), nullable=False) user = db.relationship('User', uselist=False, back_populates='comments', lazy="joined")