From 05990bf36e3cefac8be0d90b38143e29a967f56d Mon Sep 17 00:00:00 2001 From: "Choi A.K." Date: Fri, 5 Sep 2025 14:56:06 +0900 Subject: [PATCH] migrations fix --- alembic/versions/69ef23ef1ed1_init.py | 32 --------- .../versions/7506a3320699_channel_table.py | 39 ----------- alembic/versions/eeb6744b9452_init.py | 66 +++++++++++++++++++ models.py | 4 +- 4 files changed, 69 insertions(+), 72 deletions(-) delete mode 100644 alembic/versions/69ef23ef1ed1_init.py delete mode 100644 alembic/versions/7506a3320699_channel_table.py create mode 100644 alembic/versions/eeb6744b9452_init.py diff --git a/alembic/versions/69ef23ef1ed1_init.py b/alembic/versions/69ef23ef1ed1_init.py deleted file mode 100644 index c8b6950..0000000 --- a/alembic/versions/69ef23ef1ed1_init.py +++ /dev/null @@ -1,32 +0,0 @@ -"""init - -Revision ID: 69ef23ef1ed1 -Revises: -Create Date: 2025-09-05 13:53:02.737876 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '69ef23ef1ed1' -down_revision: Union[str, Sequence[str], None] = None -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### diff --git a/alembic/versions/7506a3320699_channel_table.py b/alembic/versions/7506a3320699_channel_table.py deleted file mode 100644 index 57a3a89..0000000 --- a/alembic/versions/7506a3320699_channel_table.py +++ /dev/null @@ -1,39 +0,0 @@ -"""channel table - -Revision ID: 7506a3320699 -Revises: 69ef23ef1ed1 -Create Date: 2025-09-05 14:12:37.430983 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa -from sqlalchemy.sql import table, column - - -# revision identifiers, used by Alembic. -revision: str = '7506a3320699' -down_revision: Union[str, Sequence[str], None] = '69ef23ef1ed1' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - """Upgrade schema.""" - # Для SQLite: добавляем столбцы через ALTER TABLE - conn = op.get_bind() - # Добавить столбец link, если его нет - result = conn.execute(sa.text("PRAGMA table_info(channels)")).fetchall() - columns = [row[1] for row in result] - if 'link' not in columns: - conn.execute(sa.text("ALTER TABLE channels ADD COLUMN link VARCHAR(255)")) - # Добавить столбец admin_id, если его нет - if 'admin_id' not in columns: - conn.execute(sa.text("ALTER TABLE channels ADD COLUMN admin_id INTEGER")) - - -def downgrade() -> None: - """Downgrade schema.""" - # SQLite не поддерживает удаление столбцов, поэтому просто удаляем таблицу - op.drop_table('channels') diff --git a/alembic/versions/eeb6744b9452_init.py b/alembic/versions/eeb6744b9452_init.py new file mode 100644 index 0000000..df25abd --- /dev/null +++ b/alembic/versions/eeb6744b9452_init.py @@ -0,0 +1,66 @@ +"""init + +Revision ID: eeb6744b9452 +Revises: +Create Date: 2025-09-05 14:55:12.005564 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'eeb6744b9452' +down_revision: Union[str, Sequence[str], None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('admins', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('tg_id', sa.Integer(), nullable=False), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('tg_id') + ) + op.create_table('channels', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=True), + sa.Column('link', sa.String(), nullable=True), + sa.Column('admin_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['admin_id'], ['admins.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('groups', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=False), + sa.Column('link', sa.String(), nullable=False), + sa.Column('admin_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['admin_id'], ['admins.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('buttons', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(), nullable=False), + sa.Column('url', sa.String(), nullable=False), + sa.Column('channel_id', sa.Integer(), nullable=True), + sa.Column('group_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['channel_id'], ['channels.id'], ), + sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('buttons') + op.drop_table('groups') + op.drop_table('channels') + op.drop_table('admins') + # ### end Alembic commands ### diff --git a/models.py b/models.py index 5d33d42..30f8d60 100644 --- a/models.py +++ b/models.py @@ -12,13 +12,15 @@ class Channel(Base): id = Column(Integer, primary_key=True) name = Column(String) link = Column(String) - admin_id = Column(Integer, ForeignKey('admins.id')) # если есть таблица admins + admin_id = Column(Integer, ForeignKey('admins.id')) + buttons = relationship('Button', back_populates='channel') class Group(Base): __tablename__ = 'groups' id = Column(Integer, primary_key=True) name = Column(String, nullable=False) link = Column(String, nullable=False) + admin_id = Column(Integer, ForeignKey('admins.id')) buttons = relationship('Button', back_populates='group') class Button(Base):