From 7b19ca44a3ff7e2e87d5a358873370aeb40dc7a3 Mon Sep 17 00:00:00 2001
From: Diego Imbert <70353967+diegoimbert@users.noreply.github.com>
Date: Fri, 9 Jan 2026 15:57:15 +0100
Subject: [PATCH] fix: Fix custom instance user migration (#7534)

---
 ...09143306_fix_custom_user_instance_2.down.sql |  1 +
 ...0109143306_fix_custom_user_instance_2.up.sql | 17 +++++++++++++++++
 backend/windmill-api/src/db.rs                  |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 backend/migrations/20260109143306_fix_custom_user_instance_2.down.sql
 create mode 100644 backend/migrations/20260109143306_fix_custom_user_instance_2.up.sql

diff --git a/backend/migrations/20260109143306_fix_custom_user_instance_2.down.sql b/backend/migrations/20260109143306_fix_custom_user_instance_2.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20260109143306_fix_custom_user_instance_2.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20260109143306_fix_custom_user_instance_2.up.sql b/backend/migrations/20260109143306_fix_custom_user_instance_2.up.sql
new file mode 100644
index 0000000000..9f62c53c9c
--- /dev/null
+++ b/backend/migrations/20260109143306_fix_custom_user_instance_2.up.sql
@@ -0,0 +1,17 @@
+DO $$
+DECLARE
+    dbname text := current_database();
+BEGIN
+    -- Revoke default privileges first
+    ALTER DEFAULT PRIVILEGES IN SCHEMA public
+        REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLES FROM custom_instance_user;
+    REVOKE CREATE ON SCHEMA public FROM custom_instance_user;
+    REVOKE USAGE ON SCHEMA public FROM custom_instance_user;
+    EXECUTE format('REVOKE CREATE ON DATABASE %I FROM custom_instance_user', dbname);
+    EXECUTE format('REVOKE CONNECT ON DATABASE %I FROM custom_instance_user', dbname);
+EXCEPTION
+    WHEN others THEN
+        RAISE NOTICE 'Error in custom_instance_user migration: %', SQLERRM;
+        -- Continue without failing the migration
+END
+$$;
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 87dab1b188..7a70fbe914 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -56,6 +56,7 @@ lazy_static::lazy_static! {
                     (20251105100125, include_str!(
                         "../../migrations/20251105100125_legacy_sql_result_flag.up.sql"
                     ).replace("✅", "")),
+                    (20260107133344, "".to_string()),
                     ].into_iter().collect();
 }