From 8baba58f01cea0de3374535c9a52f06b09c11d48 Mon Sep 17 00:00:00 2001 From: hugocasa Date: Tue, 24 Mar 2026 17:13:11 +0100 Subject: [PATCH] [ee] fix: apply SCIM filters to deactivated users, add name column Co-Authored-By: Claude Opus 4.6 (1M context) --- ...5a0b528988bc6335c5340c0a28882e186e0fa23539.json | 14 ++++++++++++++ ...0defb1d0d40c989bdce132736cfdc5a3c96f600091.json | 14 -------------- backend/ee-repo-ref.txt | 2 +- .../20260323000000_scim_deactivated_user.up.sql | 1 + 4 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 backend/.sqlx/query-9a1e9bc6093e21ca2dcc135a0b528988bc6335c5340c0a28882e186e0fa23539.json delete mode 100644 backend/.sqlx/query-9c3b928e73f4ed8ce8c75f0defb1d0d40c989bdce132736cfdc5a3c96f600091.json diff --git a/backend/.sqlx/query-9a1e9bc6093e21ca2dcc135a0b528988bc6335c5340c0a28882e186e0fa23539.json b/backend/.sqlx/query-9a1e9bc6093e21ca2dcc135a0b528988bc6335c5340c0a28882e186e0fa23539.json new file mode 100644 index 0000000000..9a092220f3 --- /dev/null +++ b/backend/.sqlx/query-9a1e9bc6093e21ca2dcc135a0b528988bc6335c5340c0a28882e186e0fa23539.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO scim_deactivated_user (email, name) SELECT email, name FROM password WHERE email = $1 ON CONFLICT (email) DO NOTHING", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [] + }, + "hash": "9a1e9bc6093e21ca2dcc135a0b528988bc6335c5340c0a28882e186e0fa23539" +} diff --git a/backend/.sqlx/query-9c3b928e73f4ed8ce8c75f0defb1d0d40c989bdce132736cfdc5a3c96f600091.json b/backend/.sqlx/query-9c3b928e73f4ed8ce8c75f0defb1d0d40c989bdce132736cfdc5a3c96f600091.json deleted file mode 100644 index 5945b07fd4..0000000000 --- a/backend/.sqlx/query-9c3b928e73f4ed8ce8c75f0defb1d0d40c989bdce132736cfdc5a3c96f600091.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO scim_deactivated_user (email) VALUES ($1) ON CONFLICT (email) DO NOTHING", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar" - ] - }, - "nullable": [] - }, - "hash": "9c3b928e73f4ed8ce8c75f0defb1d0d40c989bdce132736cfdc5a3c96f600091" -} diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 5888515f2e..4ab28f66d0 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -70df2da1483760297f138277a58a708416604008 \ No newline at end of file +ac0ed036d1ff3ce8535d3dd1c6c8358b2fc775ac \ No newline at end of file diff --git a/backend/migrations/20260323000000_scim_deactivated_user.up.sql b/backend/migrations/20260323000000_scim_deactivated_user.up.sql index 090d2b343e..6d27fcd879 100644 --- a/backend/migrations/20260323000000_scim_deactivated_user.up.sql +++ b/backend/migrations/20260323000000_scim_deactivated_user.up.sql @@ -1,4 +1,5 @@ CREATE TABLE scim_deactivated_user ( email VARCHAR(255) PRIMARY KEY, + name VARCHAR(255), deactivated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() );