From e3d9bfe9fa5cd0160985ae59e40da82d11a261f2 Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Sun, 8 Mar 2026 20:14:14 -0400 Subject: [PATCH] fix migration --- ...onempty_fs_name.py => 0071_sibling_roms_fs_name.py} | 4 ++-- backend/handler/database/roms_handler.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename backend/alembic/versions/{0071_sibling_roms_nonempty_fs_name.py => 0071_sibling_roms_fs_name.py} (98%) diff --git a/backend/alembic/versions/0071_sibling_roms_nonempty_fs_name.py b/backend/alembic/versions/0071_sibling_roms_fs_name.py similarity index 98% rename from backend/alembic/versions/0071_sibling_roms_nonempty_fs_name.py rename to backend/alembic/versions/0071_sibling_roms_fs_name.py index 424869d76..27d778eba 100644 --- a/backend/alembic/versions/0071_sibling_roms_nonempty_fs_name.py +++ b/backend/alembic/versions/0071_sibling_roms_fs_name.py @@ -1,6 +1,6 @@ """Fix sibling_roms view to exclude empty fs_name_no_tags from matching -Revision ID: 0071_sibling_roms_nonempty_fs_name +Revision ID: 0071_sibling_roms_fs_name Revises: 0070_ss_age_ratings Create Date: 2026-03-08 22:45:44.767000 @@ -12,7 +12,7 @@ from alembic import op from utils.database import is_postgresql # revision identifiers, used by Alembic. -revision = "0071_sibling_roms_nonempty_fs_name" +revision = "0071_sibling_roms_fs_name" down_revision = "0070_ss_age_ratings" branch_labels = None depends_on = None diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py index ae2095fcb..ea82b0e2e 100644 --- a/backend/handler/database/roms_handler.py +++ b/backend/handler/database/roms_handler.py @@ -30,7 +30,7 @@ from sqlalchemy.orm import ( noload, selectinload, ) -from sqlalchemy.sql.elements import KeyedColumnElement +from sqlalchemy.sql.elements import ColumnElement from sqlalchemy.sql.selectable import Select from config import ROMM_DB_DRIVER @@ -99,7 +99,9 @@ STRIP_ARTICLES_REGEX = r"^(the|a|an)\s+" def _create_metadata_id_case( - prefix: str, id_column: KeyedColumnElement, platform_id_column: KeyedColumnElement + prefix: str, + id_column: ColumnElement, + platform_id_column: ColumnElement, ): return case( ( @@ -693,9 +695,7 @@ class DBRomsHandler(DBBaseHandler): ), _create_metadata_id_case( "fs", - func.nullif( - base_subquery.c.fs_name_no_tags, "" - ), + func.nullif(base_subquery.c.fs_name_no_tags, ""), base_subquery.c.platform_id, ), _create_metadata_id_case(