diff --git a/backend/.sqlx/query-2ae96e8af2dddd533a0377983ec36e30091089d0a96a37d8c625ddaf85d16a83.json b/backend/.sqlx/query-45587eb1ea7b6e695327ab7dfbd13c96e7415d16f5fe7d92c308020696e3dd7f.json similarity index 72% rename from backend/.sqlx/query-2ae96e8af2dddd533a0377983ec36e30091089d0a96a37d8c625ddaf85d16a83.json rename to backend/.sqlx/query-45587eb1ea7b6e695327ab7dfbd13c96e7415d16f5fe7d92c308020696e3dd7f.json index 56b12bf36b..d54519c1af 100644 --- a/backend/.sqlx/query-2ae96e8af2dddd533a0377983ec36e30091089d0a96a37d8c625ddaf85d16a83.json +++ b/backend/.sqlx/query-45587eb1ea7b6e695327ab7dfbd13c96e7415d16f5fe7d92c308020696e3dd7f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'fix_job_completed_index')", + "query": "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'fix_job_completed_index_2')", "describe": { "columns": [ { @@ -16,5 +16,5 @@ null ] }, - "hash": "2ae96e8af2dddd533a0377983ec36e30091089d0a96a37d8c625ddaf85d16a83" + "hash": "45587eb1ea7b6e695327ab7dfbd13c96e7415d16f5fe7d92c308020696e3dd7f" } diff --git a/backend/.sqlx/query-57d830e07e40317150b24cf78248480c3a8b33e3e240385cae5703ccb9b14bec.json b/backend/.sqlx/query-87a38cdaec0e143ec3250cd9d68212ccb5b08c84fc75f9efe22d86842cd618c5.json similarity index 61% rename from backend/.sqlx/query-57d830e07e40317150b24cf78248480c3a8b33e3e240385cae5703ccb9b14bec.json rename to backend/.sqlx/query-87a38cdaec0e143ec3250cd9d68212ccb5b08c84fc75f9efe22d86842cd618c5.json index ef4092b174..37c8a327ee 100644 --- a/backend/.sqlx/query-57d830e07e40317150b24cf78248480c3a8b33e3e240385cae5703ccb9b14bec.json +++ b/backend/.sqlx/query-87a38cdaec0e143ec3250cd9d68212ccb5b08c84fc75f9efe22d86842cd618c5.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO windmill_migrations (name) VALUES ('fix_job_completed_index') ON CONFLICT DO NOTHING", + "query": "INSERT INTO windmill_migrations (name) VALUES ('fix_job_completed_index_2') ON CONFLICT DO NOTHING", "describe": { "columns": [], "parameters": { @@ -8,5 +8,5 @@ }, "nullable": [] }, - "hash": "57d830e07e40317150b24cf78248480c3a8b33e3e240385cae5703ccb9b14bec" + "hash": "87a38cdaec0e143ec3250cd9d68212ccb5b08c84fc75f9efe22d86842cd618c5" } diff --git a/backend/.sqlx/query-3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d.json b/backend/.sqlx/query-b2fe5a4185750d67eb8fa48a4d82dc3f80a667550721c6d3cced2062a18d76da.json similarity index 77% rename from backend/.sqlx/query-3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d.json rename to backend/.sqlx/query-b2fe5a4185750d67eb8fa48a4d82dc3f80a667550721c6d3cced2062a18d76da.json index 3e830501a1..72212c9c06 100644 --- a/backend/.sqlx/query-3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d.json +++ b/backend/.sqlx/query-b2fe5a4185750d67eb8fa48a4d82dc3f80a667550721c6d3cced2062a18d76da.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT COALESCE((SELECT MIN(started_at) as min_started_at\n FROM queue\n WHERE script_path = $1 AND job_kind != 'dependencies' AND running = true AND workspace_id = $2 AND canceled = false\n GROUP BY script_path), $3) as min_started_at, now() AS now", + "query": "SELECT COALESCE((SELECT MIN(started_at) as min_started_at\n FROM queue\n WHERE script_path = $1 AND job_kind != 'dependencies' AND running = true AND workspace_id = $2 AND canceled = false), $3) as min_started_at, now() AS now", "describe": { "columns": [ { @@ -26,5 +26,5 @@ null ] }, - "hash": "3901cce744c9b246b661c817e068bdb3b1ab504ff8070fcccf6c909ad75f1f6d" + "hash": "b2fe5a4185750d67eb8fa48a4d82dc3f80a667550721c6d3cced2062a18d76da" } diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs index 3318815273..c433179791 100644 --- a/backend/windmill-queue/src/jobs.rs +++ b/backend/windmill-queue/src/jobs.rs @@ -1761,8 +1761,7 @@ pub async fn pull( let min_started_at = sqlx::query!( "SELECT COALESCE((SELECT MIN(started_at) as min_started_at FROM queue - WHERE script_path = $1 AND job_kind != 'dependencies' AND running = true AND workspace_id = $2 AND canceled = false - GROUP BY script_path), $3) as min_started_at, now() AS now", + WHERE script_path = $1 AND job_kind != 'dependencies' AND running = true AND workspace_id = $2 AND canceled = false), $3) as min_started_at, now() AS now", job_script_path, &pulled_job.workspace_id, completed_count.max_ended_at