From 3b5ce47aed6f6bdf945acb31c96afa0a5700e064 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 1 May 2026 22:02:03 +0800
Subject: [PATCH] 1

---
 .../20260426_remove_legacy_roster_and_user_columns.py  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/alembic/versions/20260426_remove_legacy_roster_and_user_columns.py b/backend/alembic/versions/20260426_remove_legacy_roster_and_user_columns.py
index 7dbfd9f..8c2fd5e 100644
--- a/backend/alembic/versions/20260426_remove_legacy_roster_and_user_columns.py
+++ b/backend/alembic/versions/20260426_remove_legacy_roster_and_user_columns.py
@@ -100,10 +100,16 @@ def upgrade() -> None:
 
     user_columns = {column["name"] for column in inspector.get_columns("users")}
     if "class_id" in user_columns:
+        committee_expr = (
+            "committee_role" if "committee_role" in user_columns else "NULL AS committee_role"
+        )
+        permissions_expr = (
+            "class_permissions" if "class_permissions" in user_columns else "NULL AS class_permissions"
+        )
         legacy_rows = bind.execute(
             sa.text(
-                """
-                SELECT id, class_id, role, committee_role, class_permissions, created_at, updated_at
+                f"""
+                SELECT id, class_id, role, {committee_expr}, {permissions_expr}, created_at, updated_at
                 FROM users
                 WHERE class_id IS NOT NULL
                 """