feat(ddl): formatted DDL display with dialog or tab mode
This commit is contained in:
1 parent
86bdf9f78a
commit
76e41a6a4d
30 files changed
+956
-51
No files matched your search
@@ -20,6 +20,13 @@ import type { AiConfigItem } from "@/types/ai";
|
||||
import { DATA_GRID_EXTRACTOR_OPTIONS_MIGRATION_VERSION } from "@/lib/dataGrid/dataGridCopyExtractor";
|
||||
|
||||
describe("normalizeEditorSettings", () => {
|
||||
it("defaults DDL viewing to a dialog and preserves the selected open mode", () => {
|
||||
expect(DEFAULT_EDITOR_SETTINGS.ddlOpenMode).toBe("dialog");
|
||||
expect(normalizeEditorSettings({}).ddlOpenMode).toBe("dialog");
|
||||
expect(normalizeEditorSettings({ ddlOpenMode: "tab" }).ddlOpenMode).toBe("tab");
|
||||
expect(normalizeEditorSettings({ ddlOpenMode: "invalid" } as any).ddlOpenMode).toBe("dialog");
|
||||
});
|
||||
|
||||
it("keeps automatic DDL refresh disabled unless explicitly enabled", () => {
|
||||
expect(normalizeEditorSettings({}).refreshDdlOnOpen).toBe(false);
|
||||
expect(normalizeEditorSettings({ refreshDdlOnOpen: true }).refreshDdlOnOpen).toBe(true);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -804,6 +804,7 @@ export interface EditorSettings {
|
||||
wordWrap: boolean;
|
||||
showWhitespace: boolean;
|
||||
tableDdlWordWrap: boolean;
|
||||
ddlOpenMode: "dialog" | "tab";
|
||||
refreshDdlOnOpen: boolean;
|
||||
excludeDdlStorage: boolean;
|
||||
vimModeEnabled: boolean;
|
||||
@@ -1081,6 +1082,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
|
||||
wordWrap: false,
|
||||
showWhitespace: false,
|
||||
tableDdlWordWrap: true,
|
||||
ddlOpenMode: "dialog",
|
||||
refreshDdlOnOpen: false,
|
||||
excludeDdlStorage: true,
|
||||
vimModeEnabled: false,
|
||||
@@ -1635,6 +1637,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
||||
showWhitespace: typeof settings.showWhitespace === "boolean" ? settings.showWhitespace : DEFAULT_EDITOR_SETTINGS.showWhitespace,
|
||||
tableDdlWordWrap: typeof settings.tableDdlWordWrap === "boolean" ? settings.tableDdlWordWrap : DEFAULT_EDITOR_SETTINGS.tableDdlWordWrap,
|
||||
excludeDdlStorage: typeof settings.excludeDdlStorage === "boolean" ? settings.excludeDdlStorage : DEFAULT_EDITOR_SETTINGS.excludeDdlStorage,
|
||||
ddlOpenMode: settings.ddlOpenMode === "tab" ? "tab" : DEFAULT_EDITOR_SETTINGS.ddlOpenMode,
|
||||
refreshDdlOnOpen: typeof settings.refreshDdlOnOpen === "boolean" ? settings.refreshDdlOnOpen : DEFAULT_EDITOR_SETTINGS.refreshDdlOnOpen,
|
||||
vimModeEnabled: typeof settings.vimModeEnabled === "boolean" ? settings.vimModeEnabled : DEFAULT_EDITOR_SETTINGS.vimModeEnabled,
|
||||
autoCloseBrackets: typeof settings.autoCloseBrackets === "boolean" ? settings.autoCloseBrackets : DEFAULT_EDITOR_SETTINGS.autoCloseBrackets,
|
||||
@@ -2450,6 +2453,7 @@ export const useSettingsStore = defineStore("settings", () => {
|
||||
if (partial.showWhitespace !== undefined) editorSettings.value.showWhitespace = partial.showWhitespace === true;
|
||||
if (partial.tableDdlWordWrap !== undefined) editorSettings.value.tableDdlWordWrap = partial.tableDdlWordWrap === true;
|
||||
if (partial.excludeDdlStorage !== undefined) editorSettings.value.excludeDdlStorage = partial.excludeDdlStorage === true;
|
||||
if (partial.ddlOpenMode !== undefined) editorSettings.value.ddlOpenMode = partial.ddlOpenMode === "tab" ? "tab" : "dialog";
|
||||
if (partial.refreshDdlOnOpen !== undefined) editorSettings.value.refreshDdlOnOpen = partial.refreshDdlOnOpen === true;
|
||||
if (partial.vimModeEnabled !== undefined) editorSettings.value.vimModeEnabled = partial.vimModeEnabled === true;
|
||||
if (partial.autoCloseBrackets !== undefined) editorSettings.value.autoCloseBrackets = partial.autoCloseBrackets === true;
|
||||
|
||||
Reference in new issue
Block a user