From 7820e43e7add895aed2e88abbf96b4b01f94afe4 Mon Sep 17 00:00:00 2001
From: adlerhurst <27845747+adlerhurst@users.noreply.github.com>
Date: Mon, 28 Jul 2025 22:42:14 +0200
Subject: [PATCH] set updated_at if nothing provided

---
 .../dialect/postgres/migration/001_instance_table/up.sql      | 2 +-
 .../dialect/postgres/migration/002_organization_table/up.sql  | 2 +-
 .../dialect/postgres/migration/003_domains_table/up.sql       | 4 ++--
 backend/v3/storage/database/events_testing/org_domain_test.go | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/v3/storage/database/dialect/postgres/migration/001_instance_table/up.sql b/backend/v3/storage/database/dialect/postgres/migration/001_instance_table/up.sql
index b8faaedafd..0ca3e5f7bb 100644
--- a/backend/v3/storage/database/dialect/postgres/migration/001_instance_table/up.sql
+++ b/backend/v3/storage/database/dialect/postgres/migration/001_instance_table/up.sql
@@ -21,5 +21,5 @@ $$ LANGUAGE plpgsql;
 CREATE TRIGGER trigger_set_updated_at
 BEFORE UPDATE ON zitadel.instances
 FOR EACH ROW
-WHEN (OLD.updated_at IS NOT DISTINCT FROM NEW.updated_at)
+WHEN (NEW.updated_at IS NULL)
 EXECUTE FUNCTION zitadel.set_updated_at();
diff --git a/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql b/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql
index e8b5acef4b..0c1558ceb6 100644
--- a/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql
+++ b/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql
@@ -20,5 +20,5 @@ CREATE UNIQUE INDEX org_unique_instance_id_name_idx
 CREATE TRIGGER trigger_set_updated_at
 BEFORE UPDATE ON zitadel.organizations
 FOR EACH ROW
-WHEN (OLD.updated_at IS NOT DISTINCT FROM NEW.updated_at)
+WHEN (NEW.updated_at IS NULL)
 EXECUTE FUNCTION zitadel.set_updated_at();
diff --git a/backend/v3/storage/database/dialect/postgres/migration/003_domains_table/up.sql b/backend/v3/storage/database/dialect/postgres/migration/003_domains_table/up.sql
index fb8ae476b3..1536ffd6d1 100644
--- a/backend/v3/storage/database/dialect/postgres/migration/003_domains_table/up.sql
+++ b/backend/v3/storage/database/dialect/postgres/migration/003_domains_table/up.sql
@@ -53,14 +53,14 @@ CREATE INDEX idx_org_domain ON zitadel.org_domains(instance_id, domain);
 CREATE TRIGGER trg_set_updated_at_instance_domains
   BEFORE UPDATE ON zitadel.instance_domains
   FOR EACH ROW
-  WHEN (OLD.updated_at IS NOT DISTINCT FROM NEW.updated_at)
+  WHEN (NEW.updated_at IS NULL)
   EXECUTE FUNCTION zitadel.set_updated_at();
 
 -- Trigger to update the updated_at timestamp on org_domains
 CREATE TRIGGER trg_set_updated_at_org_domains
   BEFORE UPDATE ON zitadel.org_domains
   FOR EACH ROW
-  WHEN (OLD.updated_at IS NOT DISTINCT FROM NEW.updated_at)
+  WHEN (NEW.updated_at IS NULL)
   EXECUTE FUNCTION zitadel.set_updated_at();
 
 -- Function to check for already verified org domains
diff --git a/backend/v3/storage/database/events_testing/org_domain_test.go b/backend/v3/storage/database/events_testing/org_domain_test.go
index 6b77d3be67..edb6fb1217 100644
--- a/backend/v3/storage/database/events_testing/org_domain_test.go
+++ b/backend/v3/storage/database/events_testing/org_domain_test.go
@@ -43,6 +43,7 @@ func TestServer_TestOrgDomainReduces(t *testing.T) {
 		assert.NoError(ttt, err)
 	}, retryDuration, tick)
 
+	// The API call also sets the domain as primary, so we don't do a separate test for that.
 	t.Run("test organization domain add reduces", func(t *testing.T) {
 		// Add a domain to the organization
 		domainName := gofakeit.DomainName()