From 6c9bc283ab7069a08b852085c3703aff9cdec214 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 21 Oct 2025 11:14:36 +0000
Subject: [PATCH] fix: delete workspace_env on workspace deletion

---
 ...ee42efb674f61bd2f3507278199773d5d6479.json | 22 -------------------
 ...3c24e93208a61e65811dd14a3820102c1ae57.json | 14 ++++++++++++
 backend/windmill-api/src/workspaces_extra.rs  |  4 ++++
 3 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 backend/.sqlx/query-08643ecaac35008b37bfd71a136ee42efb674f61bd2f3507278199773d5d6479.json
 create mode 100644 backend/.sqlx/query-95d5fbae671ce95eae978193dbf3c24e93208a61e65811dd14a3820102c1ae57.json

diff --git a/backend/.sqlx/query-08643ecaac35008b37bfd71a136ee42efb674f61bd2f3507278199773d5d6479.json b/backend/.sqlx/query-08643ecaac35008b37bfd71a136ee42efb674f61bd2f3507278199773d5d6479.json
deleted file mode 100644
index 3b1b8e3825..0000000000
--- a/backend/.sqlx/query-08643ecaac35008b37bfd71a136ee42efb674f61bd2f3507278199773d5d6479.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT usage FROM usage\n        WHERE id = $1\n        AND is_workspace = FALSE\n        AND month_ = EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "usage",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "08643ecaac35008b37bfd71a136ee42efb674f61bd2f3507278199773d5d6479"
-}
diff --git a/backend/.sqlx/query-95d5fbae671ce95eae978193dbf3c24e93208a61e65811dd14a3820102c1ae57.json b/backend/.sqlx/query-95d5fbae671ce95eae978193dbf3c24e93208a61e65811dd14a3820102c1ae57.json
new file mode 100644
index 0000000000..85a5332bac
--- /dev/null
+++ b/backend/.sqlx/query-95d5fbae671ce95eae978193dbf3c24e93208a61e65811dd14a3820102c1ae57.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_env WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "95d5fbae671ce95eae978193dbf3c24e93208a61e65811dd14a3820102c1ae57"
+}
diff --git a/backend/windmill-api/src/workspaces_extra.rs b/backend/windmill-api/src/workspaces_extra.rs
index 33ddbd17e5..2df23f3ce9 100644
--- a/backend/windmill-api/src/workspaces_extra.rs
+++ b/backend/windmill-api/src/workspaces_extra.rs
@@ -448,6 +448,10 @@ pub(crate) async fn delete_workspace(
         require_super_admin(&db, &authed.email).await?;
     }
 
+    sqlx::query!("DELETE FROM workspace_env WHERE workspace_id = $1", &w_id)
+        .execute(&mut *tx)
+        .await?;
+
     sqlx::query!("DELETE FROM dependency_map WHERE workspace_id = $1", &w_id)
         .execute(&mut *tx)
         .await?;