From ed6fcc761c9772fffac28600752bc897d803fb47 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 24 Apr 2024 09:50:34 +0200 Subject: [PATCH] fix: fix label from completed_job --- backend/tests/worker.rs | 2 +- backend/windmill-api/src/jobs.rs | 2 +- backend/windmill-queue/src/jobs.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs index 36af6c8d93..924bd5d89f 100644 --- a/backend/tests/worker.rs +++ b/backend/tests/worker.rs @@ -1026,7 +1026,7 @@ async fn listen_for_uuid_on( async fn completed_job(uuid: Uuid, db: &Pool) -> CompletedJob { - sqlx::query_as::<_, CompletedJob>("SELECT * FROM completed_job WHERE id = $1").bind(uuid) + sqlx::query_as::<_, CompletedJob>("SELECT *, result->>'wm_label' as label FROM completed_job WHERE id = $1").bind(uuid) .fetch_one(db) .await .unwrap() diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs index 0cc4db533c..d4607e2a4e 100644 --- a/backend/windmill-api/src/jobs.rs +++ b/backend/windmill-api/src/jobs.rs @@ -2298,7 +2298,7 @@ pub async fn restart_flow( check_license_key_valid().await?; let completed_job = sqlx::query_as::<_, CompletedJob>( - "SELECT * from completed_job WHERE id = $1 and workspace_id = $2", + "SELECT *, result->>'wm_label' as label from completed_job WHERE id = $1 and workspace_id = $2", ) .bind(job_id) .bind(&w_id) diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs index 4a171ada84..6fb0bccd8f 100644 --- a/backend/windmill-queue/src/jobs.rs +++ b/backend/windmill-queue/src/jobs.rs @@ -2076,7 +2076,7 @@ async fn get_result_by_id_from_original_flow( json_path: Option, ) -> error::Result> { let flow_job = sqlx::query_as::<_, CompletedJob>( - "SELECT * FROM completed_job WHERE id = $1 AND workspace_id = $2", + "SELECT *, null as label FROM completed_job WHERE id = $1 AND workspace_id = $2", ) .bind(completed_flow_id) .bind(w_id) @@ -3469,7 +3469,7 @@ async fn restarted_flows_resolution( Error, > { let completed_job = sqlx::query_as::<_, CompletedJob>( - "SELECT * FROM completed_job WHERE id = $1 and workspace_id = $2", + "SELECT *, null as label FROM completed_job WHERE id = $1 and workspace_id = $2", ) .bind(completed_flow_id) .bind(workspace_id)