Merge pull request #811 from TotallyNotRobots/renovate/sqlalchemy-2.x

chore(deps): update dependency sqlalchemy to v2

Author: linuxdaemon

alembic/versions/18971030c3e0_update_quote_table_to_use_booleans.py

@@ -56,7 +56,7 @@ def upgrade() -> None:
             sa.PrimaryKeyConstraint("chan", "nick", "msg"),
         )
         op.bulk_insert(
-            new_table.name,
+            new_table,
             [
                 {
                     "chan": row.chan,
@@ -82,7 +82,7 @@ def downgrade() -> None:
         sa.column("add_nick", sa.String(25)),
         sa.column("msg", sa.String(500)),
         sa.column("time", sa.REAL),
-        sa.column("deleted", sa.Boolean, default=False),
+        sa.column("deleted", sa.Boolean),
     )
 
     if inspector.has_table(new_table.name):
@@ -102,7 +102,7 @@ def downgrade() -> None:
         )
 
         op.bulk_insert(
-            old_table.name,
+            old_table,
             [
                 {
                     "chan": row.chan,

alembic/versions/7ddf6215d3dd_sync_nullables_after_migration.py

@@ -0,0 +1,41 @@
+"""Sync nullables after migration
+
+Revision ID: 7ddf6215d3dd
+Revises: e31beb6a9203
+Create Date: 2025-11-18 17:42:39.879061
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+# revision identifiers, used by Alembic.
+revision: str = "7ddf6215d3dd"
+down_revision: str | Sequence[str] | None = "e31beb6a9203"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("tell_messages") as batch:
+        batch.alter_column(
+            "is_read", existing_type=sa.BOOLEAN(), nullable=False
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("tell_messages") as batch:
+        batch.alter_column("is_read", existing_type=sa.BOOLEAN(), nullable=True)
+    # ### end Alembic commands ###

alembic/versions/e31beb6a9203_add_msg_id_to_tells_table.py

@@ -40,7 +40,9 @@ def upgrade() -> None:
     )
     if inspector.has_table(old_table.name):
         with Session(bind=op.get_bind()) as session:
-            old_tells = session.execute(sa.select(old_table)).fetchall()
+            old_tells = (
+                session.execute(sa.select(old_table)).mappings().fetchall()
+            )
 
         op.drop_table("tell_messages", if_exists=True)
         new_table = op.create_table(
@@ -81,7 +83,7 @@ def downgrade() -> None:
     inspector = sa.inspect(op.get_bind())
     new_table = sa.table(
         "tell_messages",
-        sa.column("msg_id", sa.Integer, autoincrement=True, primary_key=True),
+        sa.column("msg_id", sa.Integer),
         sa.column("conn", sa.String),
         sa.column("sender", sa.String),
         sa.column("target", sa.String),
@@ -93,7 +95,9 @@ def downgrade() -> None:
 
     if inspector.has_table(new_table.name):
         with Session(bind=op.get_bind()) as session:
-            new_tells = session.execute(sa.select(new_table)).fetchall()
+            new_tells = (
+                session.execute(sa.select(new_table)).mappings().fetchall()
+            )
 
         op.drop_table("tells", if_exists=True)
         old_table = op.create_table(

cloudbot/bot.py

@@ -28,9 +28,7 @@
 from cloudbot.util.mapping import KeyFoldDict
 
 if TYPE_CHECKING:
-    from sqlalchemy import Table
     from sqlalchemy.engine import Engine
-    from sqlalchemy.orm import Session
 
     from cloudbot.client import Client
 
@@ -200,8 +198,8 @@ def __init__(
             max_workers=self.config.get("thread_count")
         )
 
-        self.old_db = self.config.get("old_database")
-        self.do_db_migrate = self.config.get("migrate_db")
+        self.old_db: str | None = self.config.get("old_database")
+        self.do_db_migrate: bool = self.config.get("migrate_db", False)
 
         # set values for reloading
         reloading_conf = self.config.get("reloading", {})
@@ -354,7 +352,7 @@ async def _init_routine(self) -> None:
         await self.plugin_manager.load_all(self.plugin_dir)
 
         if self.old_db and self.do_db_migrate:
-            self.migrate_db()
+            self.migrate_db(old_db_url=self.old_db)
             if self.stopped_future:
                 self.stopped_future.set_result(False)
 
@@ -548,24 +546,33 @@ async def reload_config(self) -> None:
 
         await asyncio.gather(*tasks)
 
-    def migrate_db(self) -> None:
+    def migrate_db(self, *, old_db_url: str) -> None:
         logger.info("Migrating database")
-        engine: Engine = create_engine(self.old_db, future=True)
-        old_session: Session = scoped_session(sessionmaker(bind=engine))()
-        new_session: Session = database.Session()
-        table: Table
-        inspector = sa_inspect(engine)
-        for table in database.metadata.tables.values():
-            logger.info("Migrating table %s", table.name)
-            if not inspector.has_table(table.name):
-                continue
+        engine: Engine = create_engine(old_db_url, future=True)
+        with (
+            scoped_session(
+                sessionmaker(bind=engine, future=True)
+            )() as old_session,
+            database.Session() as new_session,
+        ):
+            inspector = sa_inspect(engine)
+            for table in database.metadata.tables.values():
+                logger.info("Migrating table %s", table.name)
+                if not inspector.has_table(table.name):
+                    continue
 
-            old_data = old_session.execute(table.select()).mappings().fetchall()
-            if not old_data:
-                continue
+                old_data = (
+                    old_session.execute(table.select()).mappings().fetchall()
+                )
+                if not old_data:
+                    continue
+
+                table.create(bind=self.db_engine, checkfirst=True)
+                new_session.execute(
+                    table.insert(), [dict(row) for row in old_data]
+                )
+                new_session.commit()
+                old_session.execute(table.delete())
+                old_session.commit()
 
-            table.create(bind=self.db_engine, checkfirst=True)
-            new_session.execute(table.insert(), [dict(row) for row in old_data])
-            new_session.commit()
-            old_session.execute(table.delete())
-            old_session.commit()
+        engine.dispose()

cloudbot/event.py

@@ -14,6 +14,8 @@
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
+    import sqlalchemy.orm as sa_orm
+
 logger = logging.getLogger("cloudbot")
 
 
@@ -79,7 +81,7 @@ def __init__(
                                 should be removed from the front.
         :param irc_ctcp_text: CTCP text if this message is a CTCP command
         """
-        self.db = None
+        self.db: sa_orm.Session | None = None
         self.db_executor: concurrent.futures.Executor | None = None
         self.bot = bot
         self.conn = conn