From 7314f6d259a02fc74bff480ee09bb4b080173094 Mon Sep 17 00:00:00 2001 From: sunghyunkang1111 Date: Thu, 18 Jan 2024 08:56:00 -0600 Subject: [PATCH] add databaseName in the connection strings --- src/Explorer/Tabs/PostgresConnectTab.tsx | 12 ++++++------ src/UserContext.ts | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Explorer/Tabs/PostgresConnectTab.tsx b/src/Explorer/Tabs/PostgresConnectTab.tsx index 732b1d93f..e9afa11ac 100644 --- a/src/Explorer/Tabs/PostgresConnectTab.tsx +++ b/src/Explorer/Tabs/PostgresConnectTab.tsx @@ -16,7 +16,7 @@ import React from "react"; import { userContext } from "UserContext"; export const PostgresConnectTab: React.FC = (): JSX.Element => { - const { adminLogin, nodes, enablePublicIpAccess } = userContext.postgresConnectionStrParams; + const { adminLogin, databaseName, nodes, enablePublicIpAccess } = userContext.postgresConnectionStrParams; const [usePgBouncerPort, setUsePgBouncerPort] = React.useState(false); const [selectedNode, setSelectedNode] = React.useState(nodes?.[0]?.value); const portNumber = usePgBouncerPort ? "6432" : "5432"; @@ -40,11 +40,11 @@ export const PostgresConnectTab: React.FC = (): JSX.Element => { text: node.text, })); - const postgresSQLConnectionURL = `postgres://${adminLogin}:{your_password}@${selectedNode}:${portNumber}/citus?sslmode=require`; - const psql = `psql "host=${selectedNode} port=${portNumber} dbname=citus user=${adminLogin} password={your_password} sslmode=require"`; - const jdbc = `jdbc:postgresql://${selectedNode}:${portNumber}/citus?user=${adminLogin}&password={your_password}&sslmode=require`; - const libpq = `host=${selectedNode} port=${portNumber} dbname=citus user=${adminLogin} password={your_password} sslmode=require`; - const adoDotNet = `Server=${selectedNode};Database=citus;Port=${portNumber};User Id=${adminLogin};Password={your_password};Ssl Mode=Require;`; + const postgresSQLConnectionURL = `postgres://${adminLogin}:{your_password}@${selectedNode}:${portNumber}/${databaseName}?sslmode=require`; + const psql = `psql "host=${selectedNode} port=${portNumber} dbname=${databaseName} user=${adminLogin} password={your_password} sslmode=require"`; + const jdbc = `jdbc:postgresql://${selectedNode}:${portNumber}/${databaseName}?user=${adminLogin}&password={your_password}&sslmode=require`; + const libpq = `host=${selectedNode} port=${portNumber} dbname=${databaseName} user=${adminLogin} password={your_password} sslmode=require`; + const adoDotNet = `Server=${selectedNode};Database=${databaseName};Port=${portNumber};User Id=${adminLogin};Password={your_password};Ssl Mode=Require;`; return (
diff --git a/src/UserContext.ts b/src/UserContext.ts index b265ae80a..f7a635f4b 100644 --- a/src/UserContext.ts +++ b/src/UserContext.ts @@ -36,6 +36,7 @@ export interface Node { export interface PostgresConnectionStrParams { adminLogin: string; + databaseName: string; enablePublicIpAccess: boolean; nodes: Node[]; isMarlinServerGroup: boolean;