fix(database): handle Kingbase metadata and rename refresh
This commit is contained in:
16 files changed
+619
-37
No files matched your search
@@ -17,6 +17,7 @@ const mocks = vi.hoisted(() => ({
|
||||
tableOpenPageSize: 100,
|
||||
tabs: [] as QueryTab[],
|
||||
setTableMeta: vi.fn(),
|
||||
clearInvalidDataTabSort: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("vue-i18n", () => ({
|
||||
@@ -47,6 +48,23 @@ vi.mock("@/stores/queryStore", () => ({
|
||||
setExecuting: mocks.setExecuting,
|
||||
updateSql: mocks.updateSql,
|
||||
tabs: mocks.tabs,
|
||||
clearInvalidDataTabSort: mocks.clearInvalidDataTabSort.mockImplementation((id: string) => {
|
||||
const tab = mocks.tabs.find((item) => item.id === id);
|
||||
if (!tab?.tableMeta?.columns.length) return false;
|
||||
const simpleOrderColumn = tab.orderByInput?.match(/^"([^"]+)"\s+(?:ASC|DESC)$/i)?.[1];
|
||||
const staleSort = !!tab.resultSortColumn && !tab.tableMeta.columns.some((column) => column.name === tab.resultSortColumn);
|
||||
const staleOrder = !!simpleOrderColumn && !tab.tableMeta.columns.some((column) => column.name === simpleOrderColumn);
|
||||
if (!staleSort && !staleOrder) return false;
|
||||
if (staleSort) {
|
||||
tab.resultSortColumn = undefined;
|
||||
tab.resultSortColumnIndex = undefined;
|
||||
tab.resultSortDirection = undefined;
|
||||
tab.resultSortMode = undefined;
|
||||
tab.resultSortedSql = undefined;
|
||||
}
|
||||
if (staleOrder) tab.orderByInput = undefined;
|
||||
return true;
|
||||
}),
|
||||
setTableMeta: mocks.setTableMeta.mockImplementation((id: string, meta: NonNullable<QueryTab["tableMeta"]>) => {
|
||||
const tab = mocks.tabs.find((item) => item.id === id);
|
||||
if (tab) {
|
||||
@@ -139,6 +157,88 @@ describe("useDataGridActions", () => {
|
||||
expect(mocks.executeTabSql.mock.calls[0]?.[2]).not.toHaveProperty("preserveTotalRowCountDuringExecution");
|
||||
});
|
||||
|
||||
it("ignores a stale structured order when its column was renamed", async () => {
|
||||
const tab = tableDataTab({
|
||||
resultSortColumn: "old_name",
|
||||
resultSortColumnIndex: 1,
|
||||
resultSortDirection: "asc",
|
||||
resultSortMode: "database",
|
||||
orderByInput: '"old_name" ASC',
|
||||
tableMeta: {
|
||||
schema: "public",
|
||||
tableName: "users",
|
||||
tableType: "TABLE",
|
||||
columns: [
|
||||
{ name: "id", data_type: "integer", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
|
||||
{ name: "new_name", data_type: "text", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
|
||||
],
|
||||
primaryKeys: ["id"],
|
||||
},
|
||||
});
|
||||
mocks.tabs.push(tab);
|
||||
const actions = useDataGridActions(computed(() => tab));
|
||||
|
||||
await actions.onReloadData(tab.sql, "", "", '"old_name" ASC', undefined, undefined, "refresh");
|
||||
|
||||
expect(mocks.buildTableSelectSql).toHaveBeenCalledWith(expect.objectContaining({ orderBy: undefined }));
|
||||
expect(tab.resultSortColumn).toBeUndefined();
|
||||
expect(tab.resultSortDirection).toBeUndefined();
|
||||
expect(tab.orderByInput).toBeUndefined();
|
||||
});
|
||||
|
||||
it("ignores a stale order emitted by a mounted grid after the stored sort was cleared", async () => {
|
||||
const tab = tableDataTab({
|
||||
orderByInput: undefined,
|
||||
tableMeta: {
|
||||
schema: "public",
|
||||
tableName: "users",
|
||||
tableType: "TABLE",
|
||||
columns: [
|
||||
{ name: "id", data_type: "integer", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
|
||||
{ name: "new_name", data_type: "text", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
|
||||
],
|
||||
primaryKeys: ["id"],
|
||||
},
|
||||
});
|
||||
mocks.tabs.push(tab);
|
||||
const actions = useDataGridActions(computed(() => tab));
|
||||
|
||||
await actions.onReloadData(tab.sql, "", "", '"old_name" ASC', undefined, undefined, "refresh");
|
||||
|
||||
expect(mocks.clearInvalidDataTabSort).toHaveReturnedWith(false);
|
||||
expect(mocks.buildTableSelectSql).toHaveBeenCalledWith(expect.objectContaining({ orderBy: undefined }));
|
||||
expect(tab.orderByInput).toBeUndefined();
|
||||
});
|
||||
|
||||
it("keeps a manual order when only residual structured sort state is stale", async () => {
|
||||
const tab = tableDataTab({
|
||||
resultSortColumn: "old_name",
|
||||
resultSortColumnIndex: 1,
|
||||
resultSortDirection: "asc",
|
||||
resultSortMode: "database",
|
||||
orderByInput: "LOWER(new_name) ASC",
|
||||
tableMeta: {
|
||||
schema: "public",
|
||||
tableName: "users",
|
||||
tableType: "TABLE",
|
||||
columns: [
|
||||
{ name: "id", data_type: "integer", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
|
||||
{ name: "new_name", data_type: "text", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
|
||||
],
|
||||
primaryKeys: ["id"],
|
||||
},
|
||||
});
|
||||
mocks.tabs.push(tab);
|
||||
const actions = useDataGridActions(computed(() => tab));
|
||||
|
||||
await actions.onReloadData(tab.sql, "", "", "LOWER(new_name) ASC", undefined, undefined, "refresh");
|
||||
|
||||
expect(mocks.clearInvalidDataTabSort).toHaveReturnedWith(true);
|
||||
expect(mocks.buildTableSelectSql).toHaveBeenCalledWith(expect.objectContaining({ orderBy: "LOWER(new_name) ASC" }));
|
||||
expect(tab.resultSortColumn).toBeUndefined();
|
||||
expect(tab.orderByInput).toBe("LOWER(new_name) ASC");
|
||||
});
|
||||
|
||||
it("keeps SQL result toolbar reload free of table pagination defaults", async () => {
|
||||
const tab = {
|
||||
id: "tab-1",
|
||||
|
||||
@@ -192,4 +192,56 @@ describe("useNavigationTargets with the real query store", () => {
|
||||
expect(queryStore.createTab("connection-1", "app", "public.orders", "data", "public")).not.toBe(base);
|
||||
expect(queryStore.createTab("connection-1", "app", "public.users", "data", "public", undefined, undefined, { forceNew: true })).not.toBe(base);
|
||||
});
|
||||
|
||||
it("clears a renamed column sort when structure-save metadata reaches an open data tab", async () => {
|
||||
const { navigation, queryStore } = await setupNavigation();
|
||||
const dataTabId = queryStore.createTab("connection-1", "app", "public.users", "data", "public");
|
||||
queryStore.setTableMeta(dataTabId, {
|
||||
database: "app",
|
||||
tableName: "users",
|
||||
tableType: "TABLE",
|
||||
columns: [
|
||||
{ name: "id", data_type: "integer", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
|
||||
{ name: "old_name", data_type: "text", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
|
||||
],
|
||||
primaryKeys: ["id"],
|
||||
});
|
||||
const dataTab = queryStore.tabs.find((tab) => tab.id === dataTabId)!;
|
||||
dataTab.resultSortColumn = "old_name";
|
||||
dataTab.resultSortColumnIndex = 1;
|
||||
dataTab.resultSortDirection = "asc";
|
||||
dataTab.resultSortMode = "database";
|
||||
dataTab.orderByInput = '"old_name" ASC';
|
||||
queryStore.createTab("connection-1", "app", "Edit users", "structure", "public", "users", undefined, { forceNew: true });
|
||||
mocks.loadTableMetadata.mockResolvedValueOnce({
|
||||
metadata: {
|
||||
database: "app",
|
||||
schema: "public",
|
||||
tableName: "users",
|
||||
tableType: "TABLE",
|
||||
columns: [
|
||||
{ name: "id", data_type: "integer", is_nullable: false, column_default: null, is_primary_key: true, extra: null },
|
||||
{ name: "new_name", data_type: "text", is_nullable: true, column_default: null, is_primary_key: false, extra: null },
|
||||
],
|
||||
indexes: [],
|
||||
primaryKeys: ["id"],
|
||||
cachedAt: Date.now(),
|
||||
},
|
||||
cacheStatus: "miss",
|
||||
ageMs: 0,
|
||||
});
|
||||
|
||||
await navigation.onStructureEditorSaved(vi.fn().mockResolvedValue(undefined), vi.fn(), {
|
||||
connectionId: "connection-1",
|
||||
database: "app",
|
||||
schema: "public",
|
||||
tableName: "users",
|
||||
});
|
||||
|
||||
expect(dataTab.tableMeta?.columns.map((column) => column.name)).toEqual(["id", "new_name"]);
|
||||
expect(dataTab.tableMeta?.schema).toBe("public");
|
||||
expect(dataTab.resultSortColumn).toBeUndefined();
|
||||
expect(dataTab.resultSortDirection).toBeUndefined();
|
||||
expect(dataTab.orderByInput).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -14,7 +14,7 @@ import { effectiveDatabaseTypeForConnection, metadataSchemaForConnection } from
|
||||
import { loadTableMetadata, TABLE_METADATA_CACHE_TTL_MS } from "@/lib/metadata/tableMetadataCache";
|
||||
import { applyMongoFindSort } from "@/lib/mongo/mongoShellCommand";
|
||||
import { uuid } from "@/lib/common/utils";
|
||||
import type { DataGridSortMode } from "@/lib/dataGrid/dataGridSort";
|
||||
import { simpleDataGridOrderByReferencesMissingColumn, type DataGridSortMode } from "@/lib/dataGrid/dataGridSort";
|
||||
import type { DataGridReloadIntent } from "@/lib/dataGrid/dataGridToolbar";
|
||||
import { queryResultBaseSql, queryResultExecutionSql } from "@/lib/tabs/tabPresentation";
|
||||
|
||||
@@ -137,6 +137,10 @@ export function useDataGridActions(activeTab: ComputedRef<QueryTab | undefined>)
|
||||
const elapsed = () => `${Math.round(performance.now() - startedAt)}ms`;
|
||||
if (tab.mode === "data" && tableMetaForDataTab(tab)) {
|
||||
tab.whereInput = whereInput ?? "";
|
||||
queryStore.clearInvalidDataTabSort(tab.id);
|
||||
const realColumnNames = tab.tableMeta?.columns.map((column) => column.name) ?? [];
|
||||
const incomingSortMissing = realColumnNames.length > 0 && simpleDataGridOrderByReferencesMissingColumn(orderBy, realColumnNames);
|
||||
if (incomingSortMissing) tab.orderByInput = undefined;
|
||||
const pageLimit = limit ?? tab.resultPageLimit ?? tableOpenPageLimit(settingsStore.editorSettings.tableOpenPageSize);
|
||||
const pageOffset = offset ?? 0;
|
||||
console.info("[DBX][reloadData:start]", {
|
||||
@@ -179,7 +183,7 @@ export function useDataGridActions(activeTab: ComputedRef<QueryTab | undefined>)
|
||||
}
|
||||
try {
|
||||
console.info("[DBX][reloadData:build-sql:start]", { traceId, elapsed: elapsed() });
|
||||
const nextSql = await buildTableSql(tab, { whereInput, orderBy, limit: pageLimit, offset: pageOffset });
|
||||
const nextSql = await buildTableSql(tab, { whereInput, orderBy: incomingSortMissing ? undefined : orderBy, limit: pageLimit, offset: pageOffset });
|
||||
console.info("[DBX][reloadData:build-sql:done]", { traceId, elapsed: elapsed() });
|
||||
queryStore.updateSql(tab.id, nextSql);
|
||||
console.info("[DBX][reloadData:execute:start]", { traceId, elapsed: elapsed() });
|
||||
|
||||
@@ -286,7 +286,7 @@ export function useNavigationTargets(dialogs: { showFieldLineageDialog: { value:
|
||||
// 其它 loadTableMetadata 消费者最长 30 秒拿到旧列。不带 schema/catalog
|
||||
// 维度(宁可多废,schema 形态在各消费点可能不同)
|
||||
invalidateTableMetadataCache({ connectionId: context.connectionId, database: context.database, tableName: context.tableName });
|
||||
const matchingDataTabs = queryStore.tabs.filter((tab) => tab.mode === "data" && tab.connectionId === context.connectionId && tab.database === context.database && tab.tableMeta?.tableName === context.tableName && (tab.tableMeta.schema || "") === (context.schema || ""));
|
||||
const matchingDataTabs = queryStore.tabs.filter((tab) => tab.mode === "data" && tab.connectionId === context.connectionId && tab.database === context.database && tab.tableMeta?.tableName === context.tableName && (tab.schema || tab.tableMeta.schema || "") === (context.schema || ""));
|
||||
// 同一 catalog 只强制加载一次,结果分发给全部匹配 tab
|
||||
const loadedByCatalog = new Map<string, { columns: ColumnInfo[]; primaryKeys: string[] }>();
|
||||
for (const tab of matchingDataTabs) {
|
||||
@@ -295,8 +295,9 @@ export function useNavigationTargets(dialogs: { showFieldLineageDialog: { value:
|
||||
// 捕获不可变目标身份:await 期间 tab 可能被导航复用改指其他表,
|
||||
// 共享缓存结果落地前仍必须复核,不能解除新目标的 pending
|
||||
const capturedMeta = tab.tableMeta!;
|
||||
const capturedTarget = { connectionId: tab.connectionId, database: tab.database, schema: capturedMeta.schema, catalog: capturedMeta.catalog, tableName: capturedMeta.tableName };
|
||||
const metadataSchema = metadataSchemaForConnection(connection, tab.database, capturedMeta.schema);
|
||||
const capturedSchema = tab.schema || capturedMeta.schema;
|
||||
const capturedTarget = { connectionId: tab.connectionId, database: tab.database, schema: capturedSchema, catalog: capturedMeta.catalog, tableName: capturedMeta.tableName };
|
||||
const metadataSchema = metadataSchemaForConnection(connection, tab.database, capturedSchema);
|
||||
// 分组含 tableType:主键计算依赖它,不同 tableType 不能共享加载结果
|
||||
const catalogKey = `${capturedMeta.catalog ?? ""}\u0000${capturedMeta.tableType ?? ""}`;
|
||||
let metadata = loadedByCatalog.get(catalogKey);
|
||||
@@ -320,6 +321,7 @@ export function useNavigationTargets(dialogs: { showFieldLineageDialog: { value:
|
||||
if (!canApplyDataTabMetadata(currentTab, capturedTarget)) continue;
|
||||
queryStore.setTableMeta(tab.id, {
|
||||
...capturedMeta,
|
||||
schema: capturedSchema,
|
||||
columns: metadata.columns,
|
||||
primaryKeys: metadata.primaryKeys,
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user