Files
Enterprise-Knowledge-Base/migrations/versioned/000045_org_tenant_members.down.sql
T
wizardchen 7720db39fa fix(rbac): dedup pending join/upgrade requests per (org, tenant, type)
Plan 3 of #1303 changed the join-request lookup key from per-user
to per-tenant (GetPendingRequestByTenantAndType), but didn't touch
existing data or add a structural constraint. Result: any (org,
tenant) that had multiple pending rows under the old per-user model
now has ambiguous "which one wins" semantics — the LIMIT 1 query
returns one row, the others stay pending and resurface in admin
lists after the first is approved/rejected.

Two fixes:

1. Migration 000045 up.sql now collapses pre-existing pending rows
   to one per (org, tenant, type), keeping the earliest by
   created_at. The losers are flagged status='rejected' with a
   '[Plan 3] superseded' review_message so the audit trail shows
   it was a system cleanup, not a human reject. down.sql drops
   the new index but leaves the data mutation in place — we don't
   have enough information to safely re-promote the discarded rows.

2. Add a partial unique index on
   (organization_id, tenant_id, request_type) WHERE status='pending'
   to both the PG migration and the SQLite init schema. This makes
   the invariant structural so SubmitJoinRequest /
   RequestRoleUpgrade cannot regress.

Approved/rejected history is intentionally unconstrained so the
audit trail remains complete.
2026-05-18 17:28:58 +08:00

36 lines
1.8 KiB
SQL

-- Reverse migration for 000045_org_tenant_members.
--
-- Restore organization_members from the parked _pre_plan3 table and drop
-- the new tenant-scoped table. Because we only RENAMEd the original on
-- the way up, no data is lost on rollback — the legacy rows are still
-- intact under the renamed table.
--
-- If the parked table no longer exists (e.g. a later destructive
-- migration already dropped it), this script falls through gracefully:
-- the IF EXISTS guards leave the database in whatever state it was in.
DO $$ BEGIN RAISE NOTICE '[Migration 000045] Reverting Plan 3'; END $$;
-- Move legacy table back into place.
ALTER TABLE IF EXISTS organization_members_pre_plan3 RENAME TO organization_members;
-- Restore index names so the application code can find them by their
-- documented identifiers.
ALTER INDEX IF EXISTS idx_org_members_org_user_pre_plan3 RENAME TO idx_org_members_org_user;
ALTER INDEX IF EXISTS idx_org_members_user_id_pre_plan3 RENAME TO idx_org_members_user_id;
ALTER INDEX IF EXISTS idx_org_members_tenant_id_pre_plan3 RENAME TO idx_org_members_tenant_id;
ALTER INDEX IF EXISTS idx_org_members_role_pre_plan3 RENAME TO idx_org_members_role;
-- Drop the new table. The unique/secondary indexes go with it.
DROP TABLE IF EXISTS organization_tenant_members;
-- Drop the partial unique index added in step 5 of up.sql. The data
-- mutation (pending → rejected) is intentionally NOT reverted: those
-- duplicates were already wrong under Plan 3 semantics, and we don't
-- have enough information to safely re-promote which one should win.
-- The `[Plan 3] superseded` review_message tag makes the affected
-- rows easy to audit if a manual fix is later needed.
DROP INDEX IF EXISTS uq_org_join_requests_pending_per_tenant;
DO $$ BEGIN RAISE NOTICE '[Migration 000045] Plan 3 reverted'; END $$;