Compare commits

...

3 Commits

Author SHA1 Message Date
7254175cdb migrations
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 15:10:42 +09:00
a0cbdd5358 migrations and db creation
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 15:03:13 +09:00
05990bf36e migrations fix
Some checks failed
continuous-integration/drone/push Build is failing
2025-09-05 14:56:06 +09:00
5 changed files with 70 additions and 72 deletions

View File

@@ -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 ###

View File

@@ -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')

View File

@@ -0,0 +1,57 @@
"""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:
"""Создание всех таблиц согласно моделям."""
op.create_table(
'admins',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('tg_id', sa.Integer(), unique=True, nullable=False),
)
op.create_table(
'channels',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=True),
sa.Column('link', sa.String, nullable=True),
sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
)
op.create_table(
'groups',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=False),
sa.Column('link', sa.String, nullable=False),
sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
)
op.create_table(
'buttons',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=False),
sa.Column('url', sa.String, nullable=False),
sa.Column('channel_id', sa.Integer(), sa.ForeignKey('channels.id'), nullable=True),
sa.Column('group_id', sa.Integer(), sa.ForeignKey('groups.id'), nullable=True),
)
def downgrade() -> None:
"""Удаление всех таблиц."""
op.drop_table('buttons')
op.drop_table('groups')
op.drop_table('channels')
op.drop_table('admins')

View File

@@ -1,6 +1,16 @@
#!/bin/bash #!/bin/bash
set -e set -e
echo "[update.sh] Проверка bot.db..."
if [ -d "bot.db" ]; then
echo "Удаляю папку bot.db..."
rm -rf bot.db
fi
if [ ! -f "bot.db" ]; then
echo "Создаю пустой файл bot.db..."
touch bot.db
fi
echo "[update.sh] Получение свежего кода..." echo "[update.sh] Получение свежего кода..."
git pull git pull

View File

@@ -12,13 +12,15 @@ class Channel(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
name = Column(String) name = Column(String)
link = 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): class Group(Base):
__tablename__ = 'groups' __tablename__ = 'groups'
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
name = Column(String, nullable=False) name = Column(String, nullable=False)
link = Column(String, nullable=False) link = Column(String, nullable=False)
admin_id = Column(Integer, ForeignKey('admins.id'))
buttons = relationship('Button', back_populates='group') buttons = relationship('Button', back_populates='group')
class Button(Base): class Button(Base):