From c7b65814e10ca4fd6815acfd1db3597b4e22dee5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 17 Apr 2024 14:05:17 +0200
Subject: [PATCH] improve queue clearing for schedules

---
 ...d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21.json} | 4 ++--
 backend/windmill-api/src/schedule.rs                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename backend/.sqlx/{query-ade89de6e8527c543b182229f1febeb2513ad58b03ab526df148582264fb3a44.json => query-8d4235984f27d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21.json} (63%)

diff --git a/backend/.sqlx/query-ade89de6e8527c543b182229f1febeb2513ad58b03ab526df148582264fb3a44.json b/backend/.sqlx/query-8d4235984f27d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21.json
similarity index 63%
rename from backend/.sqlx/query-ade89de6e8527c543b182229f1febeb2513ad58b03ab526df148582264fb3a44.json
rename to backend/.sqlx/query-8d4235984f27d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21.json
index 2ad7c42e2f..824deba7fa 100644
--- a/backend/.sqlx/query-ade89de6e8527c543b182229f1febeb2513ad58b03ab526df148582264fb3a44.json
+++ b/backend/.sqlx/query-8d4235984f27d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "DELETE FROM queue WHERE schedule_path = $1 AND running = false AND workspace_id = $2",
+  "query": "DELETE FROM queue WHERE schedule_path = $1 AND running = false AND workspace_id = $2 AND is_flow_step = false",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "ade89de6e8527c543b182229f1febeb2513ad58b03ab526df148582264fb3a44"
+  "hash": "8d4235984f27d8b939ffd5c660d5b57dc38dd3b2643361ed3b7cdcd1534d2e21"
 }
diff --git a/backend/windmill-api/src/schedule.rs b/backend/windmill-api/src/schedule.rs
index d39ad75b2f..be98471c7a 100644
--- a/backend/windmill-api/src/schedule.rs
+++ b/backend/windmill-api/src/schedule.rs
@@ -800,7 +800,7 @@ pub async fn clear_schedule<'c>(
     w_id: &str,
 ) -> Result<()> {
     sqlx::query!(
-        "DELETE FROM queue WHERE schedule_path = $1 AND running = false AND workspace_id = $2",
+        "DELETE FROM queue WHERE schedule_path = $1 AND running = false AND workspace_id = $2 AND is_flow_step = false",
         path,
         w_id
     )