Merge pull request 'database fix' (#10) from v2 into main

Reviewed-on: #10

alembic/versions/69ef23ef1ed1_init.py

@@ -0,0 +1,32 @@
+"""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 ###

alembic/versions/7506a3320699_channel_table.py

@@ -0,0 +1,39 @@
+"""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')

alembic/versions/eeb6744b9452_init.py

@@ -1,57 +0,0 @@
-"""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')

bin/update.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 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] Получение свежего кода..."
 git pull
 

models.py

@@ -12,15 +12,13 @@ class Channel(Base):
     id = Column(Integer, primary_key=True)
     name = Column(String)
     link = Column(String)
-    admin_id = Column(Integer, ForeignKey('admins.id'))
+    admin_id = Column(Integer, ForeignKey('admins.id'))  # если есть таблица admins
-    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):