From 9837ad57427e9239a2b97a407551a9e15b7e0d82 Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Wed, 29 Mar 2023 20:15:04 +0800
Subject: [PATCH] fix: missing database in connection context

---
 components/ConnectionSidebar.tsx | 2 ++
 store/connection.ts              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/ConnectionSidebar.tsx b/components/ConnectionSidebar.tsx
index e77db74..ad6bb2b 100644
--- a/components/ConnectionSidebar.tsx
+++ b/components/ConnectionSidebar.tsx
@@ -68,6 +68,7 @@ const ConnectionSidebar = () => {
   };
 
   const handleConnectionSelect = async (connection: Connection) => {
+    const databaseList = await connectionStore.getOrFetchDatabaseList(connection);
     connectionStore.setCurrentConnectionCtx({
       connection,
       database: head(databaseList),
@@ -87,6 +88,7 @@ const ConnectionSidebar = () => {
       return;
     }
 
+    const databaseList = await connectionStore.getOrFetchDatabaseList(currentConnectionCtx.connection);
     const database = databaseList.find((database) => database.name === databaseName);
     connectionStore.setCurrentConnectionCtx({
       connection: currentConnectionCtx.connection,
diff --git a/store/connection.ts b/store/connection.ts
index f5e5936..2f9d25b 100644
--- a/store/connection.ts
+++ b/store/connection.ts
@@ -76,7 +76,7 @@ export const useConnectionStore = create<ConnectionState>()(
             } as Database)
         );
         const databaseList = uniqBy(
-          [...state.databaseList, ...fetchedDatabaseList],
+          [...fetchedDatabaseList, ...state.databaseList],
           (database) => `${database.connectionId}_${database.name}`
         );
         set((state) => ({