PullRequest: 893 fix: 使用getDefaultSchema获取需要定位的数据库信息

Merge branch 'fix/databaseid of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.4

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/893


Reviewed-by: 晓康 <xxk268858@oceanbase.com>


* fix: 使用getDefaultSchema获取需要定位的数据库信息

Author: yezaoshu

src/page/Gateway/customConnect.ts

@@ -36,8 +36,11 @@ import dayjs from 'dayjs';
 async function getDefaultSchema(dsId: number, userName: string) {
   const res = await listDatabases(null, dsId, 1, 999);
   const databases = res?.contents;
+  // mysql 模式的默认数据库是 information_schema
   const informationSchema = databases?.find((d) => d.name === 'information_schema');
+  // oracle 模式的的默认数据库是和用户名相同的 schema
   const sameName = databases?.find((d) => d.name?.toLowerCase() === userName?.toLowerCase());
+  // 如果都没有，则取第一个
   return informationSchema?.id || sameName?.id || databases?.[0]?.id;
 }
 
@@ -197,7 +200,6 @@ export const action = async (config: ICustomConnectAction) => {
     return 'Connection Test Failed';
   }
   const createResult = await newConnection(params);
-  const databaseName = params?.defaultSchema;
 
   if (createResult) {
     gotoSQLWorkspace(
@@ -208,7 +210,6 @@ export const action = async (config: ICustomConnectAction) => {
       generateUniqKey(),
       false,
       false,
-      databaseName,
     );
   } else {
     return 'create connection failed';

src/page/Workspace/SideBar/ResourceTree/Container.tsx

@@ -59,25 +59,13 @@ export default inject(
     }
 
     const resolveParams = async () => {
-      const databaseName = searchParams.get('databaseName');
-      if (tempDatasourceId) {
-        const databaseListData =
-          resourcetreeContext.databaseList?.length > 0
-            ? resourcetreeContext.databaseList
-            : await resourcetreeContext.reloadDatabaseList();
-        if (databaseName && databaseListData) {
-          const targetDatabase = databaseListData.find(
-            (db) => db.name === databaseName && db?.dataSource?.id === parseInt(tempDatasourceId),
-          );
-          if (targetDatabase) {
-            // 打开sql窗口
-            openNewSQLPage(targetDatabase.id);
-            // 删除databaseName参数
-            const newSearchParams = new URLSearchParams(searchParams);
-            newSearchParams.delete('databaseName');
-            setSearchParams(newSearchParams, { replace: true });
-          }
-        }
+      const databaseId = searchParams.get('databaseId');
+      if (databaseId) {
+        // 打开sql窗口
+        openNewSQLPage(parseInt(databaseId));
+        const newSearchParams = new URLSearchParams(searchParams);
+        newSearchParams.delete('databaseId');
+        setSearchParams(newSearchParams, { replace: true });
       }
     };
 

src/util/route/index.tsx

@@ -24,13 +24,12 @@ export function gotoSQLWorkspace(
   tabKey: string = '',
   isLogicalDatabase: boolean = false,
   isCreateTable: boolean = false,
-  databaseName?: string,
 ) {
   const url =
     location.origin +
     location.pathname +
     (tabKey
-      ? `#/sqlworkspace/${tabKey}/${datasourceId}?databaseName=${databaseName}`
+      ? `#/sqlworkspace/${tabKey}/${datasourceId}?databaseId=${databaseId}`
       : `#/sqlworkspace?projectId=${projectId || ''}&datasourceId=${
           datasourceId || ''
         }&databaseId=${