feat(ddl): formatted DDL display with dialog or tab mode

This commit is contained in:
_Mr丶s ゛😁® authored and GitHub committed 2026-09-24 12:27:15 +08:00
1 parent 86bdf9f78a
commit 76e41a6a4d
30 files changed
+956 -51

No files matched your search

+65
View File
@@ -69,7 +69,9 @@ import { isDataTabMetadataLifecycleStale } from "@/lib/sidebar/dataTabOpenPolicy
import type { SqlInsertMode } from "@/lib/export/sqlInsertMode";
import { tableOpenPageLimit } from "@/lib/table/tableOpenPageLimit";
import { getCachedTableMetadata, loadTableColumns, loadTableIndexes, loadTableMetadata, tableMetadataToDataTabMeta, updateCachedTableMetadataType, type TableMetadataRequest } from "@/lib/metadata/tableMetadataCache";
import { loadObjectDdl } from "@/lib/metadata/objectDdlCache";
import { MetadataTaskLimiter } from "@/lib/metadata/metadataTaskLimiter";
import { formatDdlForDisplay } from "@/lib/sql/ddlDisplay";
import { buildTableSelectSql, quoteTableDataIdentifier } from "@/lib/table/tableSelectSql";
import { connectionObjectTreeNodeSchema, connectionQueryExecutionSchema, connectionUsesDatabaseObjectTreeMode, effectiveDatabaseTypeForConnection, gaussdbCountQueryDopHint, jdbcConnectionUsesDriverRowOffset, metadataSchemaForConnection } from "@/lib/database/jdbcDialect";
import { frontendQueryTimeoutDelayMs, frontendQueryTimeoutSecsForSql, queryTimeoutSecsForConnection } from "@/lib/sql/queryTimeout";
@@ -3050,6 +3052,67 @@ export const useQueryStore = defineStore("query", () => {
clearObjectSourceLoad(tab);
}
/**
* 「先出 tab 再加载」(issue #9387):为 pending 的 DDL 新标签取回 DDL 并回填。
* 加载在 store 侧进行,不依赖该 tab 是否处于激活状态;失败就地写入
* `ddlLoad.error`,由编辑区渲染错误 + Retry,而不是弹 toast。
*/
async function loadDdlViewerTab(id: string) {
const tab = tabs.value.find((candidate) => candidate.id === id);
const request = tab?.ddlLoad;
const ddlViewer = tab?.ddlViewer;
if (!tab || !request || !ddlViewer || !tab.connectionId) return;
const { connectionId } = tab;
const { database } = tab;
const settingsStore = useSettingsStore();
try {
const connectionStore = useConnectionStore();
const databaseType = effectiveDatabaseTypeForConnection(connectionStore.getConfig(connectionId));
const { ddl } = await loadObjectDdl(
{
connectionId,
database,
schema: ddlViewer.schema || database,
tableName: ddlViewer.tableName,
objectType: ddlViewer.objectType,
catalog: tab.catalog,
},
// 与弹框打开一致:默认优先使用缓存,开启「每次打开时刷新」才强制重查
{ force: settingsStore.editorSettings.refreshDdlOnOpen },
);
const displayed = await formatDdlForDisplay(
ddl,
{
dialect: ddlViewer.formatDialect ?? "generic",
databaseType,
database,
catalog: tab.catalog,
includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,
quoteIdentifiers: settingsStore.editorSettings.generateSqlQuoteIdentifiers,
excludeDdlStorage: settingsStore.editorSettings.excludeDdlStorage,
},
settingsStore.editorSettings.sqlFormatter,
);
// 加载期间 tab 被关掉,或 pending 状态已被一次重试取代:静默丢弃这次结果
const current = tabs.value.find((candidate) => candidate.id === id);
if (current?.ddlLoad !== request) return;
updateSql(id, displayed);
markTabClean(current);
current.ddlLoad = undefined;
} catch (e: any) {
const failed = tabs.value.find((candidate) => candidate.id === id);
if (failed?.ddlLoad === request) failed.ddlLoad = { startedAt: Date.now(), error: e?.message || String(e) };
}
}
/** 就地重试失败的 DDL 加载;已完成加载的 DDL 标签走编辑区工具栏的刷新。 */
function retryDdlViewerTab(id: string) {
const tab = tabs.value.find((candidate) => candidate.id === id);
if (!tab?.ddlLoad) return;
tab.ddlLoad = { startedAt: Date.now() };
void loadDdlViewerTab(id);
}
function showExecutedQueryResults(connectionId: string, database: string, sql: string, queryResults: QueryResult[]) {
const id = createTab(connectionId, database, undefined, "query", undefined, sql);
const tab = tabs.value.find((item) => item.id === id);
@@ -9131,6 +9194,8 @@ export const useQueryStore = defineStore("query", () => {
openObjectSourceTabPending,
retryObjectSourceTab,
refreshObjectSourceTab,
loadDdlViewerTab,
retryDdlViewerTab,
showExecutedQueryResults,
focusGroup,
activateTab,