From 81575468e75efbbc7a736a334f3d411c1505bc75 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 29 Aug 2023 15:12:53 +0200 Subject: [PATCH] fix get latest deployed for path --- ...c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3.json} | 4 ++-- backend/windmill-common/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename backend/.sqlx/{query-35d2c5708645e60dd5ab56d1e6cfcd197254a534fed178a46de4a2d0f0f5d348.json => query-8062bb1ac475c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3.json} (86%) diff --git a/backend/.sqlx/query-35d2c5708645e60dd5ab56d1e6cfcd197254a534fed178a46de4a2d0f0f5d348.json b/backend/.sqlx/query-8062bb1ac475c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3.json similarity index 86% rename from backend/.sqlx/query-35d2c5708645e60dd5ab56d1e6cfcd197254a534fed178a46de4a2d0f0f5d348.json rename to backend/.sqlx/query-8062bb1ac475c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3.json index 76b8ee6cdd..99cfea3318 100644 --- a/backend/.sqlx/query-35d2c5708645e60dd5ab56d1e6cfcd197254a534fed178a46de4a2d0f0f5d348.json +++ b/backend/.sqlx/query-8062bb1ac475c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "select hash, tag, concurrent_limit, concurrency_time_window_s, cache_ttl from script where path = $1 AND workspace_id = $2 AND\n created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n deleted = false AND archived = false AND lock IS not NULL AND lock_error_logs IS NULL)", + "query": "select hash, tag, concurrent_limit, concurrency_time_window_s, cache_ttl from script where path = $1 AND workspace_id = $2 AND\n created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND\n deleted = false AND lock IS not NULL AND lock_error_logs IS NULL)", "describe": { "columns": [ { @@ -43,5 +43,5 @@ true ] }, - "hash": "35d2c5708645e60dd5ab56d1e6cfcd197254a534fed178a46de4a2d0f0f5d348" + "hash": "8062bb1ac475c4a2a016d9dfa63c95765356fe7744b817ad0c320a54a33b24f3" } diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs index ab03430814..278d2f4fd4 100644 --- a/backend/windmill-common/src/lib.rs +++ b/backend/windmill-common/src/lib.rs @@ -173,14 +173,14 @@ pub async fn get_latest_deployed_hash_for_path( let r_o = sqlx::query!( "select hash, tag, concurrent_limit, concurrency_time_window_s, cache_ttl from script where path = $1 AND workspace_id = $2 AND created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2 AND - deleted = false AND archived = false AND lock IS not NULL AND lock_error_logs IS NULL)", + deleted = false AND lock IS not NULL AND lock_error_logs IS NULL)", script_path, w_id ) .fetch_optional(db) .await?; - let script = utils::not_found_if_none(r_o, "script", script_path)?; + let script = utils::not_found_if_none(r_o, "deployed script", script_path)?; Ok(( scripts::ScriptHash(script.hash),