diff --git a/backend/.sqlx/query-1cd16f93bdc90b24ceb1e86495069c3592218d34e58d617253e8b563bc661a7a.json b/backend/.sqlx/query-d4d130bdd0ff573e7805f3bb118af2a950f7ae58c85adfa467ba549cb35d6f97.json similarity index 74% rename from backend/.sqlx/query-1cd16f93bdc90b24ceb1e86495069c3592218d34e58d617253e8b563bc661a7a.json rename to backend/.sqlx/query-d4d130bdd0ff573e7805f3bb118af2a950f7ae58c85adfa467ba549cb35d6f97.json index f2327d1700..4a0a20673e 100644 --- a/backend/.sqlx/query-1cd16f93bdc90b24ceb1e86495069c3592218d34e58d617253e8b563bc661a7a.json +++ b/backend/.sqlx/query-d4d130bdd0ff573e7805f3bb118af2a950f7ae58c85adfa467ba549cb35d6f97.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "WITH t1 AS (UPDATE websocket_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t2 AS (UPDATE kafka_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t3 AS (UPDATE postgres_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t4 AS (UPDATE mqtt_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t5 AS (UPDATE nats_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t6 AS (UPDATE sqs_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t7 AS (UPDATE amqp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4) UPDATE gcp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4", + "query": "WITH t1 AS (UPDATE websocket_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t2 AS (UPDATE kafka_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t3 AS (UPDATE postgres_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t4 AS (UPDATE mqtt_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t5 AS (UPDATE nats_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t6 AS (UPDATE sqs_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t7 AS (UPDATE amqp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), t8 AS (UPDATE gcp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4) UPDATE azure_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4", "describe": { "columns": [], "parameters": { @@ -13,5 +13,5 @@ }, "nullable": [] }, - "hash": "1cd16f93bdc90b24ceb1e86495069c3592218d34e58d617253e8b563bc661a7a" + "hash": "d4d130bdd0ff573e7805f3bb118af2a950f7ae58c85adfa467ba549cb35d6f97" } diff --git a/backend/windmill-common/src/triggers.rs b/backend/windmill-common/src/triggers.rs index 8fef198ebd..04a225f416 100644 --- a/backend/windmill-common/src/triggers.rs +++ b/backend/windmill-common/src/triggers.rs @@ -72,8 +72,9 @@ pub async fn update_triggers_script_path( t4 AS (UPDATE mqtt_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), \ t5 AS (UPDATE nats_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), \ t6 AS (UPDATE sqs_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), \ - t7 AS (UPDATE amqp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4) \ - UPDATE gcp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4", + t7 AS (UPDATE amqp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4), \ + t8 AS (UPDATE gcp_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4) \ + UPDATE azure_trigger SET script_path = $1, server_id = NULL WHERE script_path = $2 AND workspace_id = $3 AND is_flow = $4", new_path, old_path, w_id, diff --git a/backend/windmill-common/tests/rename_moves_every_trigger.rs b/backend/windmill-common/tests/rename_moves_every_trigger.rs new file mode 100644 index 0000000000..8772ce24ac --- /dev/null +++ b/backend/windmill-common/tests/rename_moves_every_trigger.rs @@ -0,0 +1,62 @@ +//! A runnable rename must carry every trigger table along. +//! +//! The tables are discovered from the schema, not listed here, so a trigger kind added later +//! fails this test until `update_triggers_script_path` updates it too. A table left out keeps +//! its triggers on the old path, where nothing runs them and no runnable page lists them. + +use sqlx::{Pool, Postgres}; + +/// Statement-level triggers fire even when no row matches, so each table only has to be +/// updated, not populated. +#[sqlx::test(migrations = "../migrations")] +async fn rename_updates_every_trigger_table(db: Pool) -> anyhow::Result<()> { + // `schedule` also targets a runnable but is moved by the rename handlers themselves, + // since a schedule at the runnable's own path is renamed with it. + let tables: Vec = sqlx::query_scalar( + "SELECT c.table_name::text FROM information_schema.columns c + JOIN information_schema.columns f + ON f.table_schema = c.table_schema AND f.table_name = c.table_name AND f.column_name = 'is_flow' + WHERE c.table_schema = 'public' AND c.column_name = 'script_path' AND c.table_name <> 'schedule' + ORDER BY 1", + ) + .fetch_all(&db) + .await?; + assert!(!tables.is_empty()); + + let mut tx = db.begin().await?; + sqlx::raw_sql( + "CREATE TEMP TABLE updated_tables (name text); + CREATE FUNCTION pg_temp.record_update() RETURNS trigger LANGUAGE plpgsql AS + $$ BEGIN INSERT INTO updated_tables VALUES (TG_TABLE_NAME); RETURN NULL; END $$;", + ) + .execute(&mut *tx) + .await?; + for t in &tables { + sqlx::query(&format!( + "CREATE TRIGGER record_update AFTER UPDATE ON {t} \ + FOR EACH STATEMENT EXECUTE FUNCTION pg_temp.record_update()" + )) + .execute(&mut *tx) + .await?; + } + + windmill_common::triggers::update_triggers_script_path( + &mut tx, + "u/test/new", + "u/test/old", + "test", + false, + ) + .await?; + let updated: Vec = sqlx::query_scalar("SELECT name FROM updated_tables") + .fetch_all(&mut *tx) + .await?; + let missed: Vec<&String> = tables.iter().filter(|t| !updated.contains(t)).collect(); + assert!( + missed.is_empty(), + "a rename leaves these trigger tables on the old path: {missed:?}. \ + Add them to `update_triggers_script_path`." + ); + + Ok(()) +}