From 2d806815972538225acf75edcda2cc9223fa6fa9 Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Wed, 30 Jul 2025 13:16:48 -0400
Subject: [PATCH 1/2] Fix

---
 .../app-connection/shared/sql/sql-connection-fns.ts      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
index 4c671986f..cee6cbbfc 100644
--- a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
+++ b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
@@ -76,13 +76,16 @@ const getConnectionConfig = ({
   }
 };
 
-export const getSqlConnectionClient = async (appConnection: Pick<TSqlConnection, "credentials" | "app">) => {
+export const getSqlConnectionClient = async (
+  appConnection: Pick<TSqlConnection, "credentials" | "app" | "gatewayId">
+) => {
   const {
     app,
-    credentials: { host: baseHost, database, port, password, username }
+    credentials: { host: baseHost, database, port, password, username },
+    gatewayId
   } = appConnection;
 
-  const [host] = await verifyHostInputValidity(baseHost);
+  const [host] = await verifyHostInputValidity(baseHost, !!gatewayId);
 
   const client = knex({
     client: SQL_CONNECTION_CLIENT_MAP[app],

From 03bd1471b2c168f63366ad1c2185eee56e50fd36 Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Wed, 30 Jul 2025 13:58:46 -0400
Subject: [PATCH 2/2] Revert old "fix" + new bug patch

---
 .../secret-rotation-v2/secret-rotation-v2-dal.ts         | 3 +++
 .../app-connection/shared/sql/sql-connection-fns.ts      | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-dal.ts b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-dal.ts
index c3e7a12fb..787c07bae 100644
--- a/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-dal.ts
+++ b/backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-dal.ts
@@ -51,6 +51,7 @@ const baseSecretRotationV2Query = ({
       db.ref("encryptedCredentials").withSchema(TableName.AppConnection).as("connectionEncryptedCredentials"),
       db.ref("description").withSchema(TableName.AppConnection).as("connectionDescription"),
       db.ref("version").withSchema(TableName.AppConnection).as("connectionVersion"),
+      db.ref("gatewayId").withSchema(TableName.AppConnection).as("connectionGatewayId"),
       db.ref("createdAt").withSchema(TableName.AppConnection).as("connectionCreatedAt"),
       db.ref("updatedAt").withSchema(TableName.AppConnection).as("connectionUpdatedAt"),
       db
@@ -104,6 +105,7 @@ const expandSecretRotation = <T extends Awaited<ReturnType<typeof baseSecretRota
     connectionCreatedAt,
     connectionUpdatedAt,
     connectionVersion,
+    connectionGatewayId,
     connectionIsPlatformManagedCredentials,
     ...el
   } = secretRotation;
@@ -123,6 +125,7 @@ const expandSecretRotation = <T extends Awaited<ReturnType<typeof baseSecretRota
       createdAt: connectionCreatedAt,
       updatedAt: connectionUpdatedAt,
       version: connectionVersion,
+      gatewayId: connectionGatewayId,
       isPlatformManagedCredentials: connectionIsPlatformManagedCredentials
     },
     folder: {
diff --git a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
index cee6cbbfc..4c671986f 100644
--- a/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
+++ b/backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
@@ -76,16 +76,13 @@ const getConnectionConfig = ({
   }
 };
 
-export const getSqlConnectionClient = async (
-  appConnection: Pick<TSqlConnection, "credentials" | "app" | "gatewayId">
-) => {
+export const getSqlConnectionClient = async (appConnection: Pick<TSqlConnection, "credentials" | "app">) => {
   const {
     app,
-    credentials: { host: baseHost, database, port, password, username },
-    gatewayId
+    credentials: { host: baseHost, database, port, password, username }
   } = appConnection;
 
-  const [host] = await verifyHostInputValidity(baseHost, !!gatewayId);
+  const [host] = await verifyHostInputValidity(baseHost);
 
   const client = knex({
     client: SQL_CONNECTION_CLIENT_MAP[app],