feat(sql-editor): reuse active connection for opened files
Closes #9263
This commit is contained in:
1 parent
0fd1d6108f
commit
5d13c5ecfc
12 files changed
+332
-40
No files matched your search
@@ -1,4 +1,6 @@
|
||||
import { normalizeExternalSqlPath } from "@/lib/sql/sqlFileOpen";
|
||||
import { supportsSqlFileExecution } from "@/lib/database/databaseFeatureSupport";
|
||||
import type { ConnectionConfig, QueryTab } from "@/types/database";
|
||||
|
||||
export const EXTERNAL_SQL_FILE_TARGETS_STORAGE_KEY = "dbx-external-sql-file-targets-v1";
|
||||
export const MAX_EXTERNAL_SQL_FILE_TARGETS = 200;
|
||||
@@ -10,10 +12,26 @@ export interface ExternalSqlFileTarget {
|
||||
schema?: string;
|
||||
}
|
||||
|
||||
type ExternalSqlFileTargetTab = Pick<QueryTab, "id" | "connectionId" | "database" | "catalog" | "schema" | "mode">;
|
||||
type ExternalSqlFileTargetConnection = Pick<ConnectionConfig, "db_type">;
|
||||
type ExternalSqlFileConnectionLookup = (connectionId: string) => ExternalSqlFileTargetConnection | undefined;
|
||||
|
||||
export function unassociatedExternalSqlFileTarget(): ExternalSqlFileTarget {
|
||||
return { connectionId: "", database: "", catalog: undefined, schema: undefined };
|
||||
}
|
||||
|
||||
export function activeTabExternalSqlFileTarget(tabs: readonly ExternalSqlFileTargetTab[], activeTabId: string | null | undefined, getConnection: ExternalSqlFileConnectionLookup): ExternalSqlFileTarget {
|
||||
const activeTab = activeTabId ? tabs.find((tab) => tab.id === activeTabId) : undefined;
|
||||
const connection = activeTab?.connectionId ? getConnection(activeTab.connectionId) : undefined;
|
||||
if (!activeTab || activeTab.mode === "plugin-workbench" || activeTab.mode === "plugin-filesystem" || !connection || !supportsSqlFileExecution(connection.db_type)) return unassociatedExternalSqlFileTarget();
|
||||
return {
|
||||
connectionId: activeTab.connectionId,
|
||||
database: activeTab.database,
|
||||
catalog: activeTab.catalog,
|
||||
schema: activeTab.schema,
|
||||
};
|
||||
}
|
||||
|
||||
interface StoredExternalSqlFileTarget extends ExternalSqlFileTarget {
|
||||
path: string;
|
||||
updatedAt: number;
|
||||
@@ -84,3 +102,7 @@ export function resolveExternalSqlFileTarget(path: string, connectionExists: (co
|
||||
if (!saved || !connectionExists(saved.connectionId)) return fallback;
|
||||
return { connectionId: saved.connectionId, database: saved.database, catalog: saved.catalog, schema: saved.schema };
|
||||
}
|
||||
|
||||
export function resolveExternalSqlFileTargetForActiveTab(path: string, tabs: readonly ExternalSqlFileTargetTab[], activeTabId: string | null | undefined, getConnection: ExternalSqlFileConnectionLookup): ExternalSqlFileTarget {
|
||||
return resolveExternalSqlFileTarget(path, (connectionId) => !!getConnection(connectionId), activeTabExternalSqlFileTarget(tabs, activeTabId, getConnection));
|
||||
}
|
||||
Reference in new issue
Block a user