Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(structure): preserve restored table drafts when metadata hydration fails

efeirefb135a1d6a74
diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue
index ff0db65d1c..41a8ac18c8 100644
--- a/apps/desktop/src/components/structure/TableStructureEditor.vue
+++ b/apps/desktop/src/components/structure/TableStructureEditor.vue
@@ -2539,7 +2539,20 @@ let restoringDraft = false;
let syncingDraft = false;
let draftHydrated = false;
let lastAppliedInitialTabRequestId: number | undefined;
-let hydratingRestoredDraft = false;
+const hydratingRestoredDraft = ref(false);
+const draftHydrationError = ref("");
+let draftHydrationRequestId = 0;
+let restoredDraftTarget = "";
+
+function draftTargetIdentity() {
+ return JSON.stringify([props.connectionId, props.database, metadataSchema.value, props.tableName, props.catalog, props.tableType, props.exactIdentity === true, databaseType.value]);
+}
+
+function invalidateDraftHydration() {
+ draftHydrationRequestId++;
+ hydratingRestoredDraft.value = false;
+ clearSqlPreviewState();
+}
let structureScrollDraftSyncTimer: ReturnType<typeof setTimeout> | undefined;
let structureColumnScrollingTimer: ReturnType<typeof setTimeout> | undefined;
let lastColumnVirtualRenderScrollTop = 0;
@@ -2835,7 +2848,7 @@ function emitDraftToParent(draft: TableStructureEditorDraft | undefined) {
}
function syncStructureScrollDraftToParent() {
- if (!draftHydrated || restoringDraft || syncingDraft) return;
+ if ((!draftHydrated && restoredDraftTarget !== draftTargetIdentity()) || restoringDraft || syncingDraft) return;
const draft = lastSyncedDraft ?? props.draft;
if (!draft) {
syncDraftToParent();
@@ -2854,7 +2867,7 @@ function syncDraftToParent() {
clearTimeout(structureScrollDraftSyncTimer);
structureScrollDraftSyncTimer = undefined;
}
- if (!draftHydrated) return;
+ if (!draftHydrated && restoredDraftTarget !== draftTargetIdentity()) return;
if (restoringDraft || syncingDraft) return;
syncingDraft = true;
emitDraftToParent(createCurrentDraft());
@@ -2953,6 +2966,7 @@ function restoreDraft(draft: TableStructureEditorDraft) {
if (indexes.value.length) loadedMetadataFacets.add("indexes");
structureScrollPositions = cloneDraftValue(draft.scrollPositions || {});
restoringDraft = false;
+ restoredDraftTarget = draftTargetIdentity();
draftHydrated = !needsColumnDraftMetadataHydration();
restoreStructureScrollPosition();
}
@@ -2961,39 +2975,89 @@ function needsColumnDraftMetadataHydration() {
return !isCreateMode.value && columns.value.some((column) => !column.original && !column.id.startsWith("new:") && !!column.name.trim());
}
-async function hydrateRestoredDraftFromDatabase() {
- if (!needsColumnDraftMetadataHydration() || hydratingRestoredDraft) return;
- const connectionId = props.connectionId;
- const database = props.database;
- const catalog = props.catalog;
- const schema = metadataSchema.value;
- const tableName = props.tableName;
- if (!connectionId || !database || !tableName) return;
-
- hydratingRestoredDraft = true;
- let shouldRefreshPreview = false;
+async function hydrateRestoredDraftFromDatabase(force = false): Promise<boolean> {
+ if (!needsColumnDraftMetadataHydration()) {
+ if (draftHydrationError.value || hydratingRestoredDraft.value) {
+ invalidateDraftHydration();
+ draftHydrationError.value = "";
+ markDraftHydratedAndSync();
+ scheduleSqlPreviewRefresh();
+ }
+ return true;
+ }
+ if (hydratingRestoredDraft.value && !force) return false;
+ const request = ddlRequest();
+ if (!request.connectionId || !request.database || !request.tableName) return false;
+ const identity = draftTargetIdentity();
+ const dbType = databaseType.value;
+ const requestId = ++draftHydrationRequestId;
+ const config = store.getConfig(request.connectionId);
+ const fingerprint = config ? connectionConfigFingerprint(config) : "";
+ let revision: number | undefined;
+ const current = () =>
+ !primaryKeyUnmounted &&
+ requestId === draftHydrationRequestId &&
+ identity === draftTargetIdentity() &&
+ (revision === undefined || store.connectionStateRevision(request.connectionId) === revision) &&
+ (store.getConfig(request.connectionId) ? connectionConfigFingerprint(store.getConfig(request.connectionId)!) : "") === fingerprint;
+ hydratingRestoredDraft.value = true;
+ draftHydrationError.value = "";
+ clearSqlPreviewState();
+ scheduleSqlPreviewRefresh();
+ let completed = false;
try {
- await store.ensureConnected(connectionId);
- const request = ddlRequest();
- let { value: nextColumns } = await loadObjectMetadataFacet(request, "columns", () => getStructureColumns(request));
- if (databaseType.value === "manticoresearch" && tableMetadataCapabilities.value.ddl) {
+ await store.ensureConnected(request.connectionId);
+ if (!current()) return false;
+ revision = store.connectionStateRevision(request.connectionId);
+ let { value: nextColumns } = await loadObjectMetadataFacet(request, "columns", () => getStructureColumns(request), { force });
+ if (!current()) return false;
+ let formattedDdl: string | undefined;
+ if (dbType === "manticoresearch" && tableMetadataCapabilities.value.ddl) {
try {
- const { ddl } = await loadObjectDdl({ connectionId, database, schema, tableName, catalog, queryTimeoutSecs: store.getConfig(connectionId)?.query_timeout_secs });
- rawDdlContent.value = await formatStructureDdl(ddl);
- ddlFetched.value = true;
+ const { ddl } = await loadObjectDdl(request);
+ formattedDdl = await formatStructureDdl(ddl);
nextColumns = applyManticoreDdlColumnExtras(nextColumns, ddl);
} catch {
/* ignore — Manticore column properties can still come from SHOW COLUMNS when available */
}
}
- columns.value = rehydrateColumnDraftsFromMetadata(columns.value, nextColumns, databaseType.value);
+ if (!current()) return false;
+ const candidate = rehydrateColumnDraftsFromMetadata(columns.value, nextColumns, dbType);
+ if (candidate.some((column) => !column.original && !column.id.startsWith("new:") && !!column.name.trim())) throw new Error(t("oceanbasePrimaryKey.incompleteMetadata"));
+ columns.value = candidate;
+ if (formattedDdl !== undefined) {
+ rawDdlContent.value = formattedDdl;
+ ddlFetched.value = true;
+ }
markDraftHydratedAndSync();
- shouldRefreshPreview = true;
+ completed = true;
+ return true;
} catch (e: any) {
- console.warn("[DBX][structure-editor:draft-hydration-failed]", e);
+ if (current()) draftHydrationError.value = `${t("oceanbasePrimaryKey.incompleteMetadata")} ${e?.message || String(e)}`;
+ return false;
} finally {
- hydratingRestoredDraft = false;
- if (shouldRefreshPreview) scheduleSqlPreviewRefresh();
+ if (requestId === draftHydrationRequestId) {
+ hydratingRestoredDraft.value = false;
+ clearSqlPreviewState();
+ if (completed || ddlDirty.value) scheduleSqlPreviewRefresh();
+ }
+ }
+}
+
+async function initializeRestoredDraftMetadata(identity: string, revalidateRestoredColumns = false) {
+ const current = () => !primaryKeyUnmounted && identity === draftTargetIdentity();
+ if (!current()) return;
+ applyInitialStructureTarget();
+ void loadMysqlAutoIncrementCounter(true);
+ if (oracleIndexRefreshError.value) {
+ await retryOracleIndexRefresh();
+ } else if ((props.exactIdentity || oracleIndexRefreshGuard.value) && !isCreateMode.value) {
+ await loadStructure(true, { columns: false, indexes: true, constraints: false, foreignKeys: false, triggers: false, partitions: false, tableComment: false }, true, { blockSecondaryMetadata: true, preserveDraft: true, forceMetadata: true });
+ }
+ if (!current()) return;
+ await loadActiveTableStructureMetadataIfNeeded();
+ if (current() && revalidateRestoredColumns) {
+ void revalidateCachedStructureMetadata(structureLoadRequestId, { columns: true, tableComment: false }, undefined);
}
}
@@ -3167,7 +3231,11 @@ function scheduleSqlPreviewRefresh() {
// none of the column-draft/metadata gates below apply to it — waiting on them
// would leave the preview pending with nothing left to trigger it.
if (!ddlDirty.value) {
- if (hydratingRestoredDraft || needsColumnDraftMetadataHydration()) return;
+ if (hydratingRestoredDraft.value || needsColumnDraftMetadataHydration() || draftHydrationError.value) {
+ clearSqlPreviewState();
+ sqlPreviewPending.value = hydratingRestoredDraft.value;
+ return;
+ }
if (!isCreateMode.value && secondaryMetadataLoading.value) {
deferredSqlPreviewRefresh = true;
return;
@@ -3280,6 +3348,11 @@ async function refreshSqlPreview() {
sqlPreviewPending.value = false;
return;
}
+ if (hydratingRestoredDraft.value || needsColumnDraftMetadataHydration() || draftHydrationError.value) {
+ clearSqlPreviewState();
+ sqlPreviewPending.value = hydratingRestoredDraft.value;
+ return;
+ }
if (!isCreateMode.value && databaseType.value === "starrocks") {
try {
const { ddl } = await loadObjectDdl(ddlRequest());
@@ -3543,6 +3616,7 @@ const canApply = computed(
!mysqlTableEngineLoading.value &&
!sqlPreviewLoading.value &&
!sqlPreviewPending.value &&
+ (ddlDirty.value || (!hydratingRestoredDraft.value && !needsColumnDraftMetadataHydration() && !draftHydrationError.value)) &&
pendingStatements.value.length > 0 &&
warnings.value.length === 0 &&
!concurrentAvailabilityInvalidated.value &&
@@ -3558,6 +3632,9 @@ function clearDraft() {
}
function resetState() {
+ invalidateDraftHydration();
+ restoredDraftTarget = "";
+ draftHydrationError.value = "";
invalidateOracleIndexReady();
loading.value = false;
saving.value = false;
@@ -3658,6 +3735,12 @@ function resetState() {
async function reloadStructureFromDatabase() {
if (isCreateMode.value) return;
if (oracleIndexRefreshError.value) return retryOracleIndexRefresh();
+ if (needsColumnDraftMetadataHydration() || draftHydrationError.value) {
+ const identity = draftTargetIdentity();
+ if (await hydrateRestoredDraftFromDatabase(true)) await initializeRestoredDraftMetadata(identity);
+ return;
+ }
+ invalidateDraftHydration();
draftHydrated = false;
if (activeTab.value !== "triggers") {
triggers.value = [];
@@ -7271,19 +7354,9 @@ onMounted(() => {
// MCP DDL, restoring its loaded-facet flags would otherwise bypass the
// invalidated backend cache entirely. Legacy/dirty drafts remain intact.
const revalidateRestoredColumns = props.draft.dirty === false && !isCreateMode.value && loadedMetadataFacets.has("columns") && !(databaseType.value === "manticoresearch" && tableMetadataCapabilities.value.ddl);
- void hydrateRestoredDraftFromDatabase().then(async () => {
- applyInitialStructureTarget();
- void loadMysqlAutoIncrementCounter(true);
- if (oracleIndexRefreshError.value) {
- await retryOracleIndexRefresh();
- } else if ((props.exactIdentity || oracleIndexRefreshGuard.value) && !isCreateMode.value) {
- await loadStructure(true, { columns: false, indexes: true, constraints: false, foreignKeys: false, triggers: false, partitions: false, tableComment: false }, true, { blockSecondaryMetadata: true, preserveDraft: true, forceMetadata: true });
- }
- await loadActiveTableStructureMetadataIfNeeded();
- if (revalidateRestoredColumns) {
- // The existing revalidation checks again for edits made while loading.
- void revalidateCachedStructureMetadata(structureLoadRequestId, { columns: true, tableComment: false }, undefined);
- }
+ const restoredIdentity = draftTargetIdentity();
+ void hydrateRestoredDraftFromDatabase().then((completed) => {
+ if (completed) return initializeRestoredDraftMetadata(restoredIdentity, revalidateRestoredColumns);
});
} else if (isCreateMode.value) {
markDraftHydratedAndSync();
@@ -7305,12 +7378,11 @@ onActivated(() => {
void loadMysqlTableEngine(props.draft?.mysqlTableEngine !== undefined);
}
if (props.draft?.initialized && !draftHydrated) {
- restoreDraft(props.draft);
+ if (restoredDraftTarget !== draftTargetIdentity()) restoreDraft(props.draft);
applyInitialStructureTarget();
- void hydrateRestoredDraftFromDatabase().then(() => {
- applyInitialStructureTarget();
- void loadMysqlAutoIncrementCounter(true);
- void loadActiveTableStructureMetadataIfNeeded();
+ const restoredIdentity = draftTargetIdentity();
+ void hydrateRestoredDraftFromDatabase().then((completed) => {
+ if (completed) return initializeRestoredDraftMetadata(restoredIdentity);
});
}
restoreStructureScrollPosition();
@@ -7331,6 +7403,7 @@ onDeactivated(() => {
destroyDdlEditor();
});
onBeforeUnmount(() => {
+ invalidateDraftHydration();
stopStructureToolbarObserver();
++copySourceScopeRequestId;
resetCopySourceTables();
@@ -7493,6 +7566,12 @@ watch([() => props.connectionId, () => props.database, databaseType], () => {
void loadDynamicDataTypeOptions();
});
+watch(draftTargetIdentity, () => {
+ invalidateDraftHydration();
+ restoredDraftTarget = "";
+ draftHydrationError.value = "";
+});
+
watch([() => props.connectionId, () => props.database, () => props.schema, () => props.catalog, () => props.tableName, databaseType, activeTab], () => {
pasteColumnsDialogOpen.value = false;
});
@@ -9407,8 +9486,8 @@ watch(
</div>
<Button data-retry-oracle-index-refresh variant="outline" size="sm" :disabled="saving || postSaveRefreshing" @click="retryOracleIndexRefresh">{{ t("common.retry") }}</Button>
</div>
- <div v-if="errorMessage" class="shrink-0 rounded-md border border-destructive/30 bg-destructive/10 px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-[length:var(--structure-font-size)] text-destructive">
- {{ errorMessage }}
+ <div v-if="errorMessage || draftHydrationError" class="shrink-0 rounded-md border border-destructive/30 bg-destructive/10 px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-[length:var(--structure-font-size)] text-destructive">
+ {{ errorMessage || draftHydrationError }}
</div>
<div class="flex shrink-0 items-center justify-end gap-2">
diff --git a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
index 9824e5a0b3..b6ec7a5d47 100644
--- a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
+++ b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
@@ -10,12 +10,14 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
// pending user edits.
const mocks = vi.hoisted(() => ({
+ revision: 0,
connection: {
id: "structure-revalidation",
name: "MySQL",
db_type: "mysql",
driver_label: "MySQL",
driver_profile: "",
+ query_timeout_secs: 30,
},
ensureConnected: vi.fn(),
executeQuery: vi.fn(),
@@ -230,14 +232,18 @@ vi.mock("@/components/editor/EditorSearchPanel.vue", async () => {
};
});
-vi.mock("@/stores/connectionStore", () => ({
- useConnectionStore: () => ({
- ensureConnected: mocks.ensureConnected,
- connectionStateRevision: () => 0,
- isCurrentConnectionStateRevision: () => true,
- getConfig: (connectionId: string) => (connectionId === mocks.connection.id ? mocks.connection : undefined),
- }),
-}));
+vi.mock("@/stores/connectionStore", async () => {
+ const { reactive } = await import("vue");
+ const config = reactive(mocks.connection);
+ return {
+ useConnectionStore: () => ({
+ ensureConnected: mocks.ensureConnected,
+ connectionStateRevision: () => mocks.revision,
+ isCurrentConnectionStateRevision: () => true,
+ getConfig: (connectionId: string) => (connectionId === mocks.connection.id ? config : undefined),
+ }),
+ };
+});
vi.mock("@/stores/productionSafetyStore", () => ({ useProductionSafetyStore: () => ({ requestConfirmation: vi.fn() }) }));
vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({ tableStructureRefreshVersion: () => 0 }) }));
vi.mock("@/stores/historyStore", () => ({ useHistoryStore: () => ({ add: vi.fn() }) }));
@@ -295,6 +301,347 @@ import { createColumnDrafts, createIndexDrafts } from "@/lib/table/tableStructur
import type { TableStructureEditorDraft } from "@/types/database";
import type { BuildTableStructureChangeSqlOptions, EditableStructureIndex } from "@/lib/table/tableStructureEditorSql";
+describe("Oracle issue 13032/13310 preview probe", () => {
+ it("keeps a complete draft preview when the inherited query timeout changes", async () => {
+ mocks.connection.db_type = "oracle";
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => ({ value: facet === "columns" ? [{ name: "REC_ID", data_type: "NUMBER", is_nullable: true, is_primary_key: false }] : facet === "comment" ? "" : [], cacheStatus: "remote" }));
+ mocks.buildTableStructureChangeSql.mockResolvedValue({ statements: ["ALTER TABLE users RENAME COLUMN REC_ID TO CHANGED"], warnings: [] });
+ const root = await mountStructureEditor();
+ const input = root.querySelector<HTMLInputElement>("[data-column-name-input]")!;
+ input.value = "CHANGED";
+ input.dispatchEvent(new Event("input", { bubbles: true }));
+ await vi.waitFor(() => expect(root.textContent).toContain("ALTER TABLE users"));
+ const { useConnectionStore } = await import("@/stores/connectionStore");
+ useConnectionStore().getConfig(mocks.connection.id)!.query_timeout_secs = 45;
+ await settle();
+ expect(root.textContent).toContain("ALTER TABLE users");
+ expect([...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "structureEditor.apply")?.disabled).toBe(false);
+ });
+ it("clears the recovery error when the last incomplete column is removed", async () => {
+ mocks.connection.db_type = "oracle";
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (facet === "columns") throw new Error("probe metadata unavailable");
+ return { value: facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const columns = createColumnDrafts(
+ [
+ { name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false },
+ { name: "KEEP", data_type: "VARCHAR2(32)", is_nullable: true, is_primary_key: false },
+ ],
+ "oracle",
+ );
+ columns[0]!.original = undefined;
+ const root = document.createElement("div");
+ document.body.append(root);
+ const app = createApp(TableStructureEditor, {
+ connectionId: mocks.connection.id,
+ database: "test",
+ tableName: "users",
+ draft: {
+ initialized: true,
+ dirty: true,
+ activeTab: "columns",
+ newTableName: "",
+ tableComment: "",
+ originalTableComment: "",
+ columns,
+ indexes: [],
+ foreignKeys: [],
+ triggers: [],
+ loadedMetadataFacets: ["columns", "indexes", "comment"],
+ },
+ });
+ mountedApps.push(app);
+ app.mount(root);
+ await settle();
+ expect(root.textContent).toContain("probe metadata unavailable");
+ const missing = [...root.querySelectorAll<HTMLInputElement>("[data-column-name-input]")].find((input) => input.value === "REC_ID")!;
+ missing.closest("tr")!.querySelector<HTMLButtonElement>("[data-delete-column-shortcut-button]")!.click();
+ await settle();
+ const keep = root.querySelector<HTMLInputElement>("[data-column-name-input]")!;
+ keep.value = "KEPT_EDIT";
+ keep.dispatchEvent(new Event("input", { bubbles: true }));
+ await settle();
+ mocks.buildTableStructureChangeSql.mockResolvedValue({ statements: ["ALTER TABLE users RENAME COLUMN KEEP TO KEPT_EDIT"], warnings: [] });
+ root.querySelector<HTMLButtonElement>("[data-refresh-structure-shortcut]")!.click();
+ await vi.waitFor(() => expect(mocks.buildTableStructureChangeSql).toHaveBeenCalled());
+ expect(root.textContent).not.toContain("probe metadata unavailable");
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("KEPT_EDIT");
+ expect(mocks.buildTableStructureChangeSql.mock.calls.at(-1)![0].columns.map((column: { name: string }) => column.name)).toEqual(["KEPT_EDIT"]);
+ expect(mocks.executeBatch).not.toHaveBeenCalled();
+ });
+ it.each(["success", "failure", "revision"])("isolates hydration completion after %s", async (outcome) => {
+ mocks.connection.db_type = "oracle";
+ let finishOld!: (value: unknown) => void;
+ let failOld!: (error: Error) => void;
+ let finishNew!: (value: unknown) => void;
+ let reads = 0;
+ const metadata = [{ name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false }];
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (facet === "columns") {
+ reads++;
+ if (reads === 1)
+ return new Promise((resolve, reject) => {
+ finishOld = resolve;
+ failOld = reject;
+ });
+ if (reads === 2)
+ return new Promise((resolve) => {
+ finishNew = resolve;
+ });
+ }
+ return { value: facet === "columns" ? metadata : facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const columns = createColumnDrafts(metadata, "oracle");
+ columns[0]!.original = undefined;
+ columns[0]!.name = "WAIT_EDIT";
+ mocks.buildTableStructureChangeSql.mockResolvedValue({ statements: ["ALTER TABLE users RENAME COLUMN REC_ID TO WAIT_EDIT"], warnings: [] });
+ const root = document.createElement("div");
+ document.body.append(root);
+ const app = createApp(TableStructureEditor, {
+ connectionId: mocks.connection.id,
+ database: "test",
+ tableName: "users",
+ draft: {
+ initialized: true,
+ dirty: true,
+ activeTab: "columns",
+ newTableName: "",
+ tableComment: "",
+ originalTableComment: "",
+ columns,
+ indexes: [],
+ foreignKeys: [],
+ triggers: [],
+ loadedMetadataFacets: ["columns", "indexes", "comment"],
+ },
+ });
+ mountedApps.push(app);
+ app.mount(root);
+ await settle();
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("true");
+ if (outcome === "revision") {
+ mocks.revision++;
+ finishOld({ value: metadata, cacheStatus: "remote" });
+ await settle();
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("false");
+ expect(mocks.buildTableStructureChangeSql).not.toHaveBeenCalled();
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("WAIT_EDIT");
+ return;
+ }
+ root.querySelector<HTMLButtonElement>("[data-refresh-structure-shortcut]")!.click();
+ await vi.waitFor(() => expect(finishNew).toBeDefined());
+ if (outcome === "success") finishOld({ value: [{ name: "WRONG", data_type: "NUMBER", is_nullable: true }], cacheStatus: "remote" });
+ else failOld(new Error("stale hydration failure"));
+ await settle();
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("true");
+ expect(mocks.buildTableStructureChangeSql).not.toHaveBeenCalled();
+ finishNew({ value: metadata, cacheStatus: "remote" });
+ await vi.waitFor(() => expect(mocks.buildTableStructureChangeSql).toHaveBeenCalled());
+ expect(root.textContent).not.toContain("stale hydration failure");
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("WAIT_EDIT");
+ expect(root.querySelectorAll("[data-column-name-input]")).toHaveLength(1);
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("false");
+ expect(mocks.executeBatch).not.toHaveBeenCalled();
+ });
+ it.each([
+ { databaseType: "oracle", exactIdentity: false },
+ { databaseType: "oceanbase-oracle", exactIdentity: false },
+ { databaseType: "oracle", exactIdentity: true },
+ ])("retries failed hydration without discarding edits ($databaseType/$exactIdentity)", async ({ databaseType, exactIdentity }) => {
+ mocks.connection.db_type = databaseType;
+ const { readOracleIndexSnapshot } = await import("@/lib/database/oracleConstraints");
+ let available = false;
+ const metadata = [{ name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false }];
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (facet === "columns" && !available) throw new Error("probe metadata unavailable");
+ return { value: facet === "columns" ? metadata : facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const columns = createColumnDrafts(metadata, databaseType as "oracle" | "oceanbase-oracle");
+ columns[0]!.original = undefined;
+ const root = document.createElement("div");
+ document.body.append(root);
+ const app = createApp(TableStructureEditor, {
+ connectionId: mocks.connection.id,
+ database: "test",
+ tableName: "users",
+ exactIdentity,
+ draft: {
+ initialized: true,
+ dirty: true,
+ activeTab: "columns",
+ newTableName: "",
+ tableComment: "",
+ originalTableComment: "",
+ columns,
+ indexes: [],
+ foreignKeys: [],
+ triggers: [],
+ loadedMetadataFacets: ["columns", "indexes", "comment"],
+ },
+ });
+ mountedApps.push(app);
+ app.mount(root);
+ await settle();
+ expect(root.textContent).toContain("probe metadata unavailable");
+ const input = root.querySelector<HTMLInputElement>("[data-column-name-input]")!;
+ input.value = "WAIT_EDIT";
+ input.dispatchEvent(new Event("input", { bubbles: true }));
+ await settle();
+ const refresh = [...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "structureEditor.refresh");
+ expect(refresh).toBeDefined();
+ refresh!.click();
+ await settle();
+ expect(root.textContent).toContain("probe metadata unavailable");
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("false");
+ available = true;
+ mocks.buildTableStructureChangeSql.mockResolvedValue({ statements: ["ALTER TABLE users RENAME COLUMN REC_ID TO WAIT_EDIT"], warnings: [] });
+ refresh!.click();
+ await vi.waitFor(() => expect(mocks.buildTableStructureChangeSql).toHaveBeenCalled());
+ const options = mocks.buildTableStructureChangeSql.mock.calls.at(-1)![0];
+ expect(options.columns[0].name).toBe("WAIT_EDIT");
+ expect(options.columns[0].original.name).toBe("REC_ID");
+ expect(mocks.loadObjectMetadataFacet.mock.calls.some((call) => call[1] === "columns" && call[3]?.force === true)).toBe(true);
+ await vi.waitFor(() => expect(root.textContent).not.toContain("probe metadata unavailable"));
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("WAIT_EDIT");
+ expect(mocks.executeBatch).not.toHaveBeenCalled();
+ if (exactIdentity) await vi.waitFor(() => expect(readOracleIndexSnapshot).toHaveBeenCalled());
+ });
+ it("keeps edits made after failed hydration across deactivate and activate", async () => {
+ const { KeepAlive, h, ref } = await import("vue");
+ mocks.connection.db_type = "oracle";
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (facet === "columns") throw new Error("probe metadata unavailable");
+ return { value: facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const draftColumns = createColumnDrafts([{ name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false }], "oracle");
+ draftColumns[0]!.original = undefined;
+ draftColumns[0]!.name = "REC_ID_CHANGED";
+ const props = {
+ connectionId: mocks.connection.id,
+ database: "test",
+ tableName: "users",
+ draft: {
+ initialized: true,
+ dirty: true,
+ activeTab: "columns" as const,
+ newTableName: "",
+ tableComment: "",
+ originalTableComment: "",
+ columns: draftColumns,
+ indexes: [],
+ foreignKeys: [],
+ triggers: [],
+ loadedMetadataFacets: ["columns", "indexes", "comment"],
+ },
+ };
+ const root = document.createElement("div");
+ document.body.append(root);
+ const shown = ref(true);
+ const app = createApp({ setup: () => () => h(KeepAlive, null, { default: () => (shown.value ? h(TableStructureEditor, props) : null) }) });
+ mountedApps.push(app);
+ app.mount(root);
+ await settle();
+ const input = root.querySelector<HTMLInputElement>("[data-column-name-input]")!;
+ input.value = "WAIT_EDIT";
+ input.dispatchEvent(new Event("input", { bubbles: true }));
+ await settle();
+ expect(input.value).toBe("WAIT_EDIT");
+ shown.value = false;
+ await settle();
+ shown.value = true;
+ await settle();
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("WAIT_EDIT");
+ });
+ it.each(["rejected", "empty", "unmatched"])("reports incomplete hydration without leaving a preview pending (%s)", async (outcome) => {
+ mocks.connection.db_type = "oracle";
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (facet === "columns") {
+ if (outcome === "rejected") throw new Error("probe metadata unavailable");
+ return { value: outcome === "empty" ? [] : [{ name: "OTHER", data_type: "NUMBER", is_nullable: true }], cacheStatus: "remote" };
+ }
+ return { value: facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const draftColumns = createColumnDrafts([{ name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false }], "oracle");
+ draftColumns[0]!.original = undefined;
+ draftColumns[0]!.name = "REC_ID_CHANGED";
+ const root = document.createElement("div");
+ document.body.append(root);
+ const app = createApp(TableStructureEditor, {
+ connectionId: mocks.connection.id,
+ database: "test",
+ tableName: "users",
+ draft: {
+ initialized: true,
+ dirty: true,
+ activeTab: "columns",
+ newTableName: "",
+ tableComment: "",
+ originalTableComment: "",
+ columns: draftColumns,
+ indexes: [],
+ foreignKeys: [],
+ triggers: [],
+ loadedMetadataFacets: ["columns", "indexes", "comment"],
+ },
+ });
+ mountedApps.push(app);
+ app.mount(root);
+ await settle();
+ await vi.waitFor(() => expect(mocks.loadObjectMetadataFacet.mock.calls.some((call) => call[1] === "columns")).toBe(true));
+ await settle();
+ expect(mocks.buildTableStructureChangeSql).not.toHaveBeenCalled();
+ expect(mocks.executeBatch).not.toHaveBeenCalled();
+ expect(root.querySelector<HTMLInputElement>("[data-column-name-input]")?.value).toBe("REC_ID_CHANGED");
+ const apply = [...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "structureEditor.apply");
+ expect(apply?.disabled).toBe(true);
+ expect(root.querySelector("[aria-busy]")?.querySelectorAll(".animate-spin")).toHaveLength(0);
+ expect(root.querySelector("[aria-busy]")?.getAttribute("aria-busy")).toBe("false");
+ expect(root.textContent).toContain(outcome === "rejected" ? "probe metadata unavailable" : "oceanbasePrimaryKey.incompleteMetadata");
+ expect(root.querySelectorAll("[data-column-name-input]")).toHaveLength(1);
+ });
+ it.each(["immediate", "delayed-indexes", "delayed-builder"])("finishes SQL preview after adding a VARCHAR2 column (%s)", async (scenario) => {
+ mocks.connection.db_type = "oracle";
+ let resolveIndexes!: (value: unknown) => void;
+ let resolveBuilder!: (value: unknown) => void;
+ mocks.loadObjectMetadataFacet.mockImplementation(async (_request, facet) => {
+ if (scenario === "delayed-indexes" && facet === "indexes")
+ return new Promise((resolve) => {
+ resolveIndexes = resolve;
+ });
+ return { value: facet === "columns" ? [{ name: "REC_ID", data_type: "VARCHAR2(32)", is_nullable: false, is_primary_key: false }] : facet === "comment" ? "" : [], cacheStatus: "remote" };
+ });
+ const built = { statements: ['ALTER TABLE users ADD ("test" VARCHAR2(255))'], warnings: [] };
+ mocks.buildTableStructureChangeSql.mockImplementation(async () =>
+ scenario === "delayed-builder"
+ ? new Promise((resolve) => {
+ resolveBuilder = resolve;
+ })
+ : built,
+ );
+ const root = await mountStructureEditor();
+ if (scenario === "delayed-indexes") {
+ expect(mocks.buildTableStructureChangeSql).not.toHaveBeenCalled();
+ resolveIndexes({ value: [], cacheStatus: "remote" });
+ await settle();
+ }
+ const add = [...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "structureEditor.addColumn");
+ expect(add).toBeDefined();
+ add!.click();
+ await settle();
+ const fields = [...root.querySelectorAll<HTMLInputElement>("[data-column-name-input]")];
+ const field = fields.at(-1)!;
+ field.value = "test";
+ field.dispatchEvent(new Event("input", { bubbles: true }));
+ await vi.waitFor(() => expect(mocks.buildTableStructureChangeSql).toHaveBeenCalled());
+ if (scenario === "delayed-builder") resolveBuilder(built);
+ await vi.waitFor(() => expect(root.textContent).toContain("ALTER TABLE users ADD"));
+ const apply = [...root.querySelectorAll<HTMLButtonElement>("button")].find((button) => button.textContent?.trim() === "structureEditor.apply");
+ expect(apply).toBeDefined();
+ expect(apply!.disabled).toBe(false);
+ });
+});
+
const mountedApps: App[] = [];
const initialColumns = [{ name: "id", data_type: "bigint", nullable: false, default_value: null, comment: "" }];
@@ -337,6 +684,8 @@ async function mountStructureEditor(draft?: TableStructureEditorDraft, tableName
beforeEach(() => {
vi.clearAllMocks();
+ mocks.revision = 0;
+ mocks.connection.query_timeout_secs = 30;
mocks.connection.db_type = "mysql";
mocks.connection.driver_profile = "";
mocks.ensureConnected.mockResolvedValue(undefined);