diff --git a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx index b2c0b6d8a8b..910bb0b68fb 100644 --- a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx +++ b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx @@ -34,7 +34,7 @@ import { DatabaseConnectionType, } from './Connect.constants' import { CodeBlockFileHeader, ConnectionPanel } from './ConnectionPanel' -import { getConnectionStrings, getPoolerTld } from './DatabaseSettings.utils' +import { getConnectionStrings } from './DatabaseSettings.utils' import examples, { Example } from './DirectConnectionExamples' const StepLabel = ({ @@ -131,11 +131,6 @@ export const DatabaseConnectionString = () => { }, } - const poolerTld = - isSuccessPoolingInfo && poolingConfiguration !== undefined - ? getPoolerTld(poolingConfiguration?.connectionString) - : 'com' - // @mildtomato - Possible reintroduce later // // const poolerConnStringSyntax = @@ -311,8 +306,8 @@ export const DatabaseConnectionString = () => { ...CONNECTION_PARAMETERS.port, value: poolingConfiguration?.db_port.toString() ?? '6543', }, - { ...CONNECTION_PARAMETERS.database, value: connectionInfo.db_name }, - { ...CONNECTION_PARAMETERS.user, value: connectionInfo.db_user }, + { ...CONNECTION_PARAMETERS.database, value: poolingConfiguration?.db_name ?? '' }, + { ...CONNECTION_PARAMETERS.user, value: poolingConfiguration?.db_user ?? '' }, { ...CONNECTION_PARAMETERS.pool_mode, value: 'transaction' }, ]} onCopyCallback={() => handleCopy(selectedTab)} @@ -345,8 +340,8 @@ export const DatabaseConnectionString = () => { parameters={[ { ...CONNECTION_PARAMETERS.host, value: poolingConfiguration?.db_host ?? '' }, { ...CONNECTION_PARAMETERS.port, value: '5432' }, - { ...CONNECTION_PARAMETERS.database, value: connectionInfo.db_name }, - { ...CONNECTION_PARAMETERS.user, value: connectionInfo.db_user }, + { ...CONNECTION_PARAMETERS.database, value: poolingConfiguration?.db_name ?? '' }, + { ...CONNECTION_PARAMETERS.user, value: poolingConfiguration?.db_user ?? '' }, { ...CONNECTION_PARAMETERS.pool_mode, value: 'session' }, ]} onCopyCallback={() => handleCopy(selectedTab)} diff --git a/apps/studio/components/interfaces/Connect/DatabaseSettings.utils.ts b/apps/studio/components/interfaces/Connect/DatabaseSettings.utils.ts index 2796b0a20b2..23ee85486d5 100644 --- a/apps/studio/components/interfaces/Connect/DatabaseSettings.utils.ts +++ b/apps/studio/components/interfaces/Connect/DatabaseSettings.utils.ts @@ -376,13 +376,3 @@ export const constructConnStringSyntax = ( return [] } - -export const getPoolerTld = (connString: string) => { - try { - const segment = connString.split('pooler.supabase.')[1] - const tld = segment.split(':6543')[0] - return tld - } catch { - return 'com' - } -}