From f175158b9ffcc0d9c35938e61dfe3ce56d3b64c2 Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:40:32 +0100
Subject: [PATCH] fix: handle flow & workspace renames for `flow_node` (#4861)

---
 ...5893edb73694601544fea7cf20f45dd25a88d.json | 27 +++++++++++++++++++
 ...20241206075559_flow_node_unique_2.down.sql |  3 +++
 .../20241206075559_flow_node_unique_2.up.sql  |  3 +++
 .../windmill-worker/src/worker_lockfiles.rs   |  4 +--
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 backend/.sqlx/query-5af51d5bf7614274ade044120045893edb73694601544fea7cf20f45dd25a88d.json
 create mode 100644 backend/migrations/20241206075559_flow_node_unique_2.down.sql
 create mode 100644 backend/migrations/20241206075559_flow_node_unique_2.up.sql

diff --git a/backend/.sqlx/query-5af51d5bf7614274ade044120045893edb73694601544fea7cf20f45dd25a88d.json b/backend/.sqlx/query-5af51d5bf7614274ade044120045893edb73694601544fea7cf20f45dd25a88d.json
new file mode 100644
index 0000000000..f4021d8985
--- /dev/null
+++ b/backend/.sqlx/query-5af51d5bf7614274ade044120045893edb73694601544fea7cf20f45dd25a88d.json
@@ -0,0 +1,27 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO flow_node (path, workspace_id, hash_v2, lock, code, flow)\n        VALUES ($1, $2, $3, $4, $5, $6)\n        ON CONFLICT (path, workspace_id, hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id\n        RETURNING id\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Bpchar",
+        "Text",
+        "Text",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "5af51d5bf7614274ade044120045893edb73694601544fea7cf20f45dd25a88d"
+}
diff --git a/backend/migrations/20241206075559_flow_node_unique_2.down.sql b/backend/migrations/20241206075559_flow_node_unique_2.down.sql
new file mode 100644
index 0000000000..b6e6db03e6
--- /dev/null
+++ b/backend/migrations/20241206075559_flow_node_unique_2.down.sql
@@ -0,0 +1,3 @@
+-- Add down migration script here
+ALTER TABLE flow_node DROP CONSTRAINT IF EXISTS flow_node_unique_2;
+ALTER TABLE flow_node ADD CONSTRAINT flow_node_hash_v2_key UNIQUE (hash_v2);
diff --git a/backend/migrations/20241206075559_flow_node_unique_2.up.sql b/backend/migrations/20241206075559_flow_node_unique_2.up.sql
new file mode 100644
index 0000000000..4e8383bd89
--- /dev/null
+++ b/backend/migrations/20241206075559_flow_node_unique_2.up.sql
@@ -0,0 +1,3 @@
+-- Add up migration script here
+ALTER TABLE flow_node ADD CONSTRAINT flow_node_unique_2 UNIQUE (path, workspace_id, hash_v2);
+ALTER TABLE flow_node DROP CONSTRAINT IF EXISTS flow_node_hash_v2_key;
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index 0ea7456ec3..ec739a88a2 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -1027,8 +1027,6 @@ async fn insert_flow_node<'c>(
 ) -> Result<(sqlx::Transaction<'c, sqlx::Postgres>, FlowNodeId)> {
     let hash = {
         let mut hasher = sha2::Sha256::new();
-        hasher.update(path);
-        hasher.update(workspace_id);
         hasher.update(code.unwrap_or(&Default::default()));
         hasher.update(lock.unwrap_or(&Default::default()));
         hasher.update(flow.unwrap_or(&Default::default()).get());
@@ -1040,7 +1038,7 @@ async fn insert_flow_node<'c>(
         r#"
         INSERT INTO flow_node (path, workspace_id, hash_v2, lock, code, flow)
         VALUES ($1, $2, $3, $4, $5, $6)
-        ON CONFLICT (hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id
+        ON CONFLICT (path, workspace_id, hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id
         RETURNING id
         "#,
         path,