fixup! Revise initial migration

Several discrepancies existed between the production database, a development database, and the defined SQLAlchemy models.
This commit is contained in:
Spotlight 2024-09-24 00:06:31 -05:00
parent c30ae776a2
commit 509024d33d
No known key found for this signature in database
GPG Key ID: 874AA355B3209BDC
2 changed files with 17 additions and 107 deletions

View File

@ -51,8 +51,8 @@ class Friend(Base):
username: Mapped[Optional[str]]
message: Mapped[Optional[str]]
mii: Mapped[Optional[str]]
joinable: Mapped[bool]
game_description: Mapped[Optional[str]] = mapped_column("game_description", nullable=False)
joinable: Mapped[Optional[bool]]
game_description: Mapped[Optional[str]] = mapped_column("game_description")
last_online: Mapped[int] = mapped_column("last_online", BigInteger(), nullable=False)
favorite_game: Mapped[int] = mapped_column("favorite_game", BigInteger(), nullable=False)
@ -60,7 +60,7 @@ class Friend(Base):
class DiscordFriends(Base):
__tablename__ = "discord_friends"
id: Mapped[int] = mapped_column(primary_key=True)
id: Mapped[int] = mapped_column(BigInteger(), primary_key=True)
friend_code: Mapped[str] = mapped_column("friend_code", primary_key=True, nullable=False)
network: Mapped[NetworkType] = mapped_column("network", NetworkTypeValue())
active: Mapped[bool] = mapped_column(nullable=False)

View File

@ -7,7 +7,6 @@ Create Date: 2024-09-23 23:00:12.054892
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
# revision identifiers, used by Alembic.
revision = 'f2475122ee84'
@ -18,11 +17,6 @@ depends_on = None
def upgrade():
with op.batch_alter_table('discord', schema=None) as batch_op:
batch_op.alter_column('id',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False,
autoincrement=True)
batch_op.alter_column('refresh',
existing_type=sa.TEXT(),
type_=sa.String(),
@ -34,42 +28,23 @@ def upgrade():
batch_op.alter_column('session',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
existing_nullable=True)
batch_op.alter_column('token',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
batch_op.alter_column('last_accessed',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
batch_op.alter_column('generation_date',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
existing_nullable=True)
with op.batch_alter_table('discord_friends', schema=None) as batch_op:
batch_op.alter_column('id',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
batch_op.alter_column('friend_code',
existing_type=sa.TEXT(),
type_=sa.String(),
existing_nullable=False)
batch_op.alter_column('network',
existing_type=sa.INTEGER(),
nullable=False)
with op.batch_alter_table('friends', schema=None) as batch_op:
batch_op.create_index('friends_friendcode_network_idx', ['friend_code', 'network'], unique=False)
batch_op.alter_column('friend_code',
existing_type=sa.TEXT(),
type_=sa.String(),
existing_nullable=False)
batch_op.alter_column('network',
existing_type=sa.INTEGER(),
nullable=False)
batch_op.alter_column('title_id',
existing_type=sa.TEXT(),
type_=sa.String(),
@ -78,81 +53,44 @@ def upgrade():
existing_type=sa.TEXT(),
type_=sa.String(),
existing_nullable=False)
batch_op.alter_column('last_accessed',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
batch_op.alter_column('account_creation',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
batch_op.alter_column('username',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
existing_nullable=True)
batch_op.alter_column('message',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
existing_nullable=True)
batch_op.alter_column('mii',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
batch_op.alter_column('joinable',
existing_type=sa.BOOLEAN(),
nullable=False)
existing_nullable=True)
batch_op.alter_column('game_description',
existing_type=sa.TEXT(),
type_=sa.String(),
nullable=False)
batch_op.alter_column('last_online',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
batch_op.alter_column('favorite_game',
existing_type=sa.BIGINT(),
type_=sa.Integer(),
existing_nullable=False)
existing_nullable=True)
batch_op.drop_index('friends_friendcode_network_idx')
def downgrade():
with op.batch_alter_table('friends', schema=None) as batch_op:
batch_op.drop_index('friends_friendcode_network_idx')
batch_op.alter_column('favorite_game',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
batch_op.alter_column('last_online',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
batch_op.create_index('friends_friendcode_network_idx', ['friend_code', 'network'], unique=False)
batch_op.alter_column('game_description',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
batch_op.alter_column('joinable',
existing_type=sa.BOOLEAN(),
nullable=True)
existing_nullable=True)
batch_op.alter_column('mii',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
existing_nullable=True)
batch_op.alter_column('message',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
existing_nullable=True)
batch_op.alter_column('username',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
batch_op.alter_column('account_creation',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
batch_op.alter_column('last_accessed',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
existing_nullable=True)
batch_op.alter_column('upd_id',
existing_type=sa.String(),
type_=sa.TEXT(),
@ -161,44 +99,26 @@ def downgrade():
existing_type=sa.String(),
type_=sa.TEXT(),
existing_nullable=False)
batch_op.alter_column('network',
existing_type=sa.INTEGER(),
nullable=True)
batch_op.alter_column('friend_code',
existing_type=sa.String(),
type_=sa.TEXT(),
existing_nullable=False)
with op.batch_alter_table('discord_friends', schema=None) as batch_op:
batch_op.alter_column('network',
existing_type=sa.INTEGER(),
nullable=True)
batch_op.alter_column('friend_code',
existing_type=sa.String(),
type_=sa.TEXT(),
existing_nullable=False)
batch_op.alter_column('id',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
with op.batch_alter_table('discord', schema=None) as batch_op:
batch_op.alter_column('generation_date',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
batch_op.alter_column('last_accessed',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False)
batch_op.alter_column('token',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
existing_nullable=True)
batch_op.alter_column('session',
existing_type=sa.String(),
type_=sa.TEXT(),
nullable=True)
existing_nullable=True)
batch_op.alter_column('bearer',
existing_type=sa.String(),
type_=sa.TEXT(),
@ -207,13 +127,3 @@ def downgrade():
existing_type=sa.String(),
type_=sa.TEXT(),
existing_nullable=False)
batch_op.alter_column('id',
existing_type=sa.Integer(),
type_=sa.BIGINT(),
existing_nullable=False,
autoincrement=True)
with op.batch_alter_table('config', schema=None) as batch_op:
batch_op.alter_column('backend_uptime',
existing_type=postgresql.TIMESTAMP(),
nullable=True)