fix(transfer): support gbase jdbc connections
This commit is contained in:
9 files changed
+240
-13
No files matched your search
@@ -7,7 +7,7 @@ import { isInternalDorisCatalog } from "@/lib/database/databaseFeatureSupport";
|
||||
import type { CatalogInfo, ConnectionConfig } from "@/types/database";
|
||||
import * as api from "@/lib/backend/api";
|
||||
|
||||
type NamespaceOptionsConnection = Pick<ConnectionConfig, "database" | "db_type" | "driver_profile" | "visible_databases" | "visible_schemas">;
|
||||
type NamespaceOptionsConnection = Pick<ConnectionConfig, "database" | "db_type" | "driver_profile" | "visible_databases" | "visible_schemas"> & Partial<Pick<ConnectionConfig, "database_info">>;
|
||||
export function catalogDatabaseOptionsKey(connectionId: string, catalog: string): string {
|
||||
return `${connectionId}:${catalog}`;
|
||||
}
|
||||
@@ -31,8 +31,10 @@ export function databaseAfterCatalogChange(currentDatabase: string, databaseOpti
|
||||
return databaseOptions.includes(currentDatabase) ? currentDatabase : "";
|
||||
}
|
||||
|
||||
export function databaseOptionsForConnection(databaseNames: string[], connection: Pick<ConnectionConfig, "db_type" | "visible_databases"> | undefined): string[] {
|
||||
export function databaseOptionsForConnection(databaseNames: string[], connection: (Pick<ConnectionConfig, "db_type" | "visible_databases"> & Partial<Pick<ConnectionConfig, "database" | "database_info">>) | undefined): string[] {
|
||||
const names = filterDatabaseNamesForConnection(databaseNames, connection);
|
||||
const configuredDatabase = connection?.database?.trim() || connection?.database_info?.currentDatabase?.trim();
|
||||
if (names.length === 0 && configuredDatabase) return [configuredDatabase];
|
||||
if (names.length === 0 && usesTreeSchemaMode(connection?.db_type)) return [""];
|
||||
return names;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user