chore: fix alembic migrations (#708)

* chore: fix alembic migrations

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 2 people

alembic/versions/158030827560_base_schema.py

@@ -110,7 +110,12 @@ def upgrade() -> None:
     op.create_table(
         "comments",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("target_id", sa.Integer(), nullable=False),
+        sa.Column(
+            "target_id",
+            sa.Integer(),
+            nullable=False,
+            comment="replay, map, or set id",
+        ),
         sa.Column("target_type", mysql.ENUM("replay", "map", "song"), nullable=False),
         sa.Column("userid", sa.Integer(), nullable=False),
         sa.Column("time", sa.Integer(), nullable=False),
@@ -119,7 +124,7 @@ def upgrade() -> None:
             mysql.VARCHAR(charset="utf8mb3", collation="utf8mb3_general_ci", length=80),
             nullable=False,
         ),
-        sa.Column("colour", sa.CHAR(length=6), nullable=True),
+        sa.Column("colour", sa.CHAR(length=6), nullable=True, comment="rgb hex string"),
         sa.PrimaryKeyConstraint("id"),
     )
     op.create_table(
@@ -133,7 +138,12 @@ def upgrade() -> None:
         "ingame_logins",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
         sa.Column("userid", sa.Integer(), nullable=False),
-        sa.Column("ip", sa.String(length=45), nullable=False),
+        sa.Column(
+            "ip",
+            sa.String(length=45),
+            nullable=False,
+            comment="maxlen for ipv6",
+        ),
         sa.Column("osu_ver", sa.Date(), nullable=False),
         sa.Column("osu_stream", sa.String(length=11), nullable=False),
         sa.Column("datetime", sa.DateTime(), nullable=False),
@@ -142,7 +152,12 @@ def upgrade() -> None:
     op.create_table(
         "logs",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("from", sa.Integer(), nullable=False),
+        sa.Column(
+            "from",
+            sa.Integer(),
+            nullable=False,
+            comment="both from and to are playerids",
+        ),
         sa.Column("to", sa.Integer(), nullable=False),
         sa.Column("action", sa.String(length=32), nullable=False),
         sa.Column(
@@ -193,7 +208,7 @@ def upgrade() -> None:
         "maps",
         sa.Column(
             "server",
-            mysql.ENUM("replay", "map", "song"),
+            mysql.ENUM("osu!", "private"),
             server_default="osu!",
             nullable=False,
         ),
@@ -343,6 +358,12 @@ def upgrade() -> None:
         sa.Column("online_checksum", mysql.CHAR(length=32), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
+    op.create_index(
+        "scores_fetch_leaderboard_generic_index",
+        "scores",
+        ["map_md5", "status", "mode"],
+        unique=False,
+    )
     op.create_index("scores_map_md5_index", "scores", ["map_md5"], unique=False)
     op.create_index("scores_mode_index", "scores", ["mode"], unique=False)
     op.create_index("scores_mods_index", "scores", ["mods"], unique=False)
@@ -357,12 +378,6 @@ def upgrade() -> None:
     op.create_index("scores_score_index", "scores", ["score"], unique=False)
     op.create_index("scores_status_index", "scores", ["status"], unique=False)
     op.create_index("scores_userid_index", "scores", ["userid"], unique=False)
-    op.create_index(
-        "scores_fetch_leaderboard_generic_index",
-        "scores",
-        ["map_md5", "status", "mode"],
-        unique=False,
-    )
     op.create_table(
         "stats",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
@@ -406,7 +421,7 @@ def upgrade() -> None:
         "tourney_pool_maps",
         sa.Column("map_id", sa.Integer(), nullable=False),
         sa.Column("pool_id", sa.Integer(), nullable=False),
-        sa.Column("mods", mysql.BIGINT(), nullable=False),
+        sa.Column("mods", sa.Integer(), nullable=False),
         sa.Column("slot", mysql.TINYINT(), nullable=False),
         sa.PrimaryKeyConstraint("map_id", "pool_id"),
     )
@@ -425,7 +440,7 @@ def upgrade() -> None:
     op.create_table(
         "tourney_pools",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("name", mysql.VARCHAR(length=64), nullable=False),
+        sa.Column("name", mysql.VARCHAR(length=16), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=False),
         sa.Column("created_by", sa.Integer(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
@@ -457,8 +472,8 @@ def upgrade() -> None:
     op.create_table(
         "users",
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("name", mysql.MEDIUMTEXT(), nullable=False),
-        sa.Column("safe_name", mysql.MEDIUMTEXT(), nullable=False),
+        sa.Column("name", mysql.VARCHAR(length=32), nullable=False),
+        sa.Column("safe_name", mysql.VARCHAR(length=32), nullable=False),
         sa.Column("email", sa.String(length=254), nullable=False),
         sa.Column("priv", sa.Integer(), server_default="1", nullable=False),
         sa.Column("pw_bcrypt", mysql.CHAR(length=60), nullable=False),
@@ -527,7 +542,6 @@ def downgrade() -> None:
     op.drop_index("stats_pp_index", table_name="stats")
     op.drop_index("stats_mode_index", table_name="stats")
     op.drop_table("stats")
-    op.drop_index("scores_fetch_leaderboard_generic_index", table_name="scores")
     op.drop_index("scores_userid_index", table_name="scores")
     op.drop_index("scores_status_index", table_name="scores")
     op.drop_index("scores_score_index", table_name="scores")
@@ -537,6 +551,7 @@ def downgrade() -> None:
     op.drop_index("scores_mods_index", table_name="scores")
     op.drop_index("scores_mode_index", table_name="scores")
     op.drop_index("scores_map_md5_index", table_name="scores")
+    op.drop_index("scores_fetch_leaderboard_generic_index", table_name="scores")
     op.drop_table("scores")
     op.drop_table("ratings")
     op.drop_index("maps_status_index", table_name="maps")

app/repositories/comments.py

@@ -29,7 +29,12 @@ class CommentsTable(Base):
     __tablename__ = "comments"
 
     id = Column("id", Integer, nullable=False, primary_key=True, autoincrement=True)
-    target_id = Column("target_id", Integer, nullable=False)
+    target_id = Column(
+        "target_id",
+        Integer,
+        nullable=False,
+        comment="replay, map, or set id",
+    )
     target_type = Column(ENUM(TargetType), nullable=False)
     userid = Column("userid", Integer, nullable=False)
     time = Column("time", Integer, nullable=False)
@@ -38,7 +43,7 @@ class CommentsTable(Base):
         VARCHAR(charset="utf8mb3", collation="utf8mb3_general_ci", length=80),
         nullable=False,
     )
-    colour = Column("colour", CHAR(6), nullable=True)
+    colour = Column("colour", CHAR(6), nullable=True, comment="rgb hex string")
 
 
 READ_PARAMS = (

app/repositories/ingame_logins.py

@@ -23,7 +23,7 @@ class IngameLoginsTable(Base):
 
     id = Column("id", Integer, nullable=False, primary_key=True, autoincrement=True)
     userid = Column("userid", Integer, nullable=False)
-    ip = Column("ip", String(45), nullable=False)
+    ip = Column("ip", String(45), nullable=False, comment="maxlen for ipv6")
     osu_ver = Column("osu_ver", Date, nullable=False)
     osu_stream = Column("osu_stream", String(11), nullable=False)
     datetime = Column("datetime", DateTime, nullable=False)

app/repositories/logs.py

@@ -21,7 +21,12 @@ class LogTable(Base):
     __tablename__ = "logs"
 
     id = Column("id", Integer, nullable=False, primary_key=True, autoincrement=True)
-    _from = Column("from", Integer, nullable=False)
+    _from = Column(
+        "from",
+        Integer,
+        nullable=False,
+        comment="both from and to are playerids",
+    )
     to = Column("to", Integer, nullable=False)
     action = Column("action", String(32), nullable=False)
     msg = Column(

app/repositories/maps.py

@@ -27,16 +27,15 @@
 
 
 class Server(StrEnum):
-    replay = "replay"
-    map = "map"
-    song = "song"
+    osu = "osu!"
+    private = "private"
 
 
 class MapsTable(Base):
     __tablename__ = "maps"
 
     server = Column(
-        ENUM(Server),
+        ENUM(Server, values_callable=lambda enum: [e.value for e in enum]),
         nullable=False,
         server_default="osu!",
         primary_key=True,

app/repositories/performance_reports.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+from sqlalchemy import Column
+from sqlalchemy import Index
+from sqlalchemy.dialects.mysql import BIGINT
+from sqlalchemy.dialects.mysql import ENUM
+from sqlalchemy.dialects.mysql import INTEGER
+from sqlalchemy.dialects.mysql import TINYINT
+from sqlalchemy.dialects.mysql import VARCHAR
+
+from app.repositories import Base
+
+
+class ModMode(str):
+    VANILLA = "vanilla"
+    RELAX = "relax"
+    AUTOPILOT = "autopilot"
+
+
+class PerformanceReportsTable(Base):
+    __tablename__ = "performance_reports"
+
+    scoreid = Column(BIGINT(20), nullable=False, primary_key=True)
+    mod_mode = Column(
+        ENUM(ModMode),
+        nullable=False,
+        server_default=ModMode.VANILLA,
+        primary_key=True,
+    )
+    os = Column(VARCHAR(length=64), nullable=False)
+    fullscreen = Column(TINYINT(1), nullable=False)
+    fps_cap = Column(VARCHAR(length=16), nullable=False)
+    compatibility = Column(TINYINT(1), nullable=False)
+    version = Column(VARCHAR(length=16), nullable=False)
+    start_time = Column(INTEGER, nullable=False)
+    end_time = Column(INTEGER, nullable=False)
+    frame_count = Column(INTEGER, nullable=False)
+    spike_frames = Column(INTEGER, nullable=False)
+    aim_rate = Column(INTEGER, nullable=False)
+    completion = Column(TINYINT(1), nullable=False)
+    identifier = Column(VARCHAR(length=128), nullable=True)
+    average_frametime = Column(INTEGER, nullable=False)

app/repositories/startups.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from sqlalchemy import Column
+from sqlalchemy import DateTime
+from sqlalchemy.dialects.mysql import INTEGER
+from sqlalchemy.dialects.mysql import TINYINT
+
+from app.repositories import Base
+
+
+class StartupsTable(Base):
+    __tablename__ = "startups"
+
+    id = Column(INTEGER, autoincrement=True, nullable=False, primary_key=True)
+    ver_major = Column(TINYINT, nullable=False)
+    ver_minor = Column(TINYINT, nullable=False)
+    ver_micro = Column(TINYINT, nullable=False)
+    datetime = Column(DateTime, nullable=False)

app/repositories/tourney_pool_maps.py

@@ -9,7 +9,6 @@
 from sqlalchemy import delete
 from sqlalchemy import insert
 from sqlalchemy import select
-from sqlalchemy.dialects.mysql import BIGINT
 from sqlalchemy.dialects.mysql import TINYINT
 
 import app.state.services
@@ -21,7 +20,7 @@ class TourneyPoolMapsTable(Base):
 
     map_id = Column("map_id", Integer, nullable=False, primary_key=True)
     pool_id = Column("pool_id", Integer, nullable=False, primary_key=True)
-    mods = Column("mods", BIGINT, nullable=False)
+    mods = Column("mods", Integer, nullable=False)
     slot = Column("slot", TINYINT, nullable=False)
 
     __table_args__ = (

app/repositories/tourney_pools.py

@@ -22,7 +22,7 @@ class TourneyPoolsTable(Base):
     __tablename__ = "tourney_pools"
 
     id = Column("id", Integer, nullable=False, primary_key=True, autoincrement=True)
-    name = Column("name", VARCHAR(length=64), nullable=False)
+    name = Column("name", VARCHAR(length=16), nullable=False)
     created_at = Column("created_at", DateTime, nullable=False)
     created_by = Column("created_by", Integer, nullable=False)
 

app/repositories/users.py

@@ -27,8 +27,8 @@ class UsersTable(Base):
     __tablename__ = "users"
 
     id = Column(Integer, primary_key=True, nullable=False, autoincrement=True)
-    name = Column(MEDIUMTEXT, nullable=False)
-    safe_name = Column(MEDIUMTEXT, nullable=False)
+    name = Column(VARCHAR(length=32), nullable=False)
+    safe_name = Column(VARCHAR(length=32), nullable=False)
     email = Column(String(254), nullable=False)
     priv = Column(Integer, nullable=False, server_default="1")
     pw_bcrypt = Column(CHAR(length=60), nullable=False)