a3x
/
nyaa
mirror of https://gitlab.com/SIGBUS/nyaa.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix user preferences from #515 (#532)

This commit is contained in:
A nyaa developer 2018-12-06 15:47:08 +01:00 committed by GitHub
parent e04bbdfbf9
commit 4fea839f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migrations/versions/0b03879cdb05_add_user_preferences_table.py → migrations/versions/8a6a7662eb37_add_user_preferences_table.py
View File

@ -1,8 +1,8 @@
"""Add user preferences table """Add user preferences table
Revision ID: 0b03879cdb05 Revision ID: 8a6a7662eb37
Revises: f703f911d4ae Revises: f703f911d4ae
Create Date: 2018-08-11 13:23:01.863441 Create Date: 2018-11-20 17:02:26.408532
""" """
from alembic import op from alembic import op
@ -10,7 +10,7 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '0b03879cdb05' revision = '8a6a7662eb37'
down_revision = 'f703f911d4ae' down_revision = 'f703f911d4ae'
branch_labels = None branch_labels = None
depends_on = None depends_on = None
@ -19,13 +19,17 @@ depends_on = None
def upgrade(): def upgrade():
# ### commands auto generated by Alembic - please adjust! ### # ### commands auto generated by Alembic - please adjust! ###
op.create_table('user_preferences', op.create_table('user_preferences',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False), sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('hide_comments', sa.Boolean(), nullable=False), sa.Column('hide_comments', sa.Boolean(), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ), sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('id'), sa.PrimaryKeyConstraint('user_id')
sa.UniqueConstraint('user_id')
) )
connection = op.get_bind()
print('Populating user_preferences...')
connection.execute(sa.sql.text('INSERT INTO user_preferences (user_id) SELECT id FROM users'))
print('Done.')
# ### end Alembic commands ### # ### end Alembic commands ###

5
nyaa/models.py
View File

@ -647,14 +647,13 @@ class User(db.Model):
class UserPreferences(db.Model): class UserPreferences(db.Model):
__tablename__ = 'user_preferences' __tablename__ = 'user_preferences'
id = db.Column(db.Integer, primary_key=True) user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), primary_key=True)
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), unique=True, nullable=False)
def __init__(self, user_id): def __init__(self, user_id):
self.user_id = user_id self.user_id = user_id
def __repr__(self): def __repr__(self):
return '<UserPreferences %r>' % self.id return '<UserPreferences %r>' % self.user_id
user = db.relationship('User', back_populates='preferences') user = db.relationship('User', back_populates='preferences')
hide_comments = db.Column(db.Boolean, nullable=False, default=False) hide_comments = db.Column(db.Boolean, nullable=False, default=False)