From 96155e2d504d4f20ffbb8c68d7e4a5f0fe9b4f3e Mon Sep 17 00:00:00 2001
From: NathanFlurry <git@nathanflurry.com>
Date: Tue, 29 Oct 2024 09:18:45 +0000
Subject: [PATCH] fix: fix dynamic config query (#1276)

<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

<!-- If there are frontend changes, please include screenshots. -->
---
 .../dynamic-config/src/ops/get_config.rs        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/services/dynamic-config/src/ops/get_config.rs b/packages/services/dynamic-config/src/ops/get_config.rs
index dd7a6f7c75..98db632481 100644
--- a/packages/services/dynamic-config/src/ops/get_config.rs
+++ b/packages/services/dynamic-config/src/ops/get_config.rs
@@ -28,10 +28,19 @@ pub async fn get_cluster_id(ctx: &OperationCtx, input: &Input) -> GlobalResult<O
 			sql_fetch_one!(
 				[ctx, (Uuid,)]
 				"
-				INSERT INTO config (id, cluster_id)
-				VALUES (1, $1)
-				ON CONFLICT (id) DO NOTHING
-				RETURNING cluster_id
+				WITH new_row AS (
+					INSERT INTO db_dynamic_config.config (id, cluster_id)
+					VALUES (1, $1)
+					ON CONFLICT (id) DO NOTHING
+					RETURNING cluster_id
+				)
+				SELECT cluster_id 
+				FROM new_row
+				UNION ALL
+				SELECT cluster_id 
+				FROM db_dynamic_config.config
+				WHERE NOT EXISTS (SELECT 1 FROM new_row)
+
 				",
 				default_cluster_id
 			)