fix(table-data): load metadata before initial query

This commit is contained in:
t8y2 committed 2026-06-11 23:19:45 +08:00
1 parent 3640541222
commit 3f7987aa59
2 files changed
+39 -37

No files matched your search

@@ -63,7 +63,7 @@ import { resolveDefaultDatabase } from "@/lib/defaultDatabase";
import { canTreeNodeShowExpander, treeItemPaddingLeft, usesFullWidthTreeLabel } from "@/lib/sidebarTreeItemLayout"; import { canTreeNodeShowExpander, treeItemPaddingLeft, usesFullWidthTreeLabel } from "@/lib/sidebarTreeItemLayout";
import { buildTableSelectSql } from "@/lib/tableSelectSql"; import { buildTableSelectSql } from "@/lib/tableSelectSql";
import { clearActiveTableReferencePayload, createTableReferencePayload, createTableReferenceDropEvent, setActiveTableReferencePayload, type QueryEditorTableReferencePayload } from "@/lib/queryEditorTableDrop"; import { clearActiveTableReferencePayload, createTableReferencePayload, createTableReferenceDropEvent, setActiveTableReferencePayload, type QueryEditorTableReferencePayload } from "@/lib/queryEditorTableDrop";
import { editablePrimaryKeys } from "@/lib/tableEditing"; import { editablePrimaryKeys, usesSyntheticRowIdKey } from "@/lib/tableEditing";
import { supportsDatabaseCreation, supportsDatabaseSearch, supportsFieldLineage, supportsObjectBrowserTreeNode, supportsSchemaDiagram, supportsSqlFileExecution, supportsTableImport, supportsTableTruncate, supportsTableStructureEditing, usesTreeSchemaMode } from "@/lib/databaseCapabilities"; import { supportsDatabaseCreation, supportsDatabaseSearch, supportsFieldLineage, supportsObjectBrowserTreeNode, supportsSchemaDiagram, supportsSqlFileExecution, supportsTableImport, supportsTableTruncate, supportsTableStructureEditing, usesTreeSchemaMode } from "@/lib/databaseCapabilities";
import { copyNameForTreeNode, objectSourceKindForTreeNode, sidebarSelectionCopyAction, treeNodeRowAction, treeNodeRowDoubleClickAction } from "@/lib/treeNodeClick"; import { copyNameForTreeNode, objectSourceKindForTreeNode, sidebarSelectionCopyAction, treeNodeRowAction, treeNodeRowDoubleClickAction } from "@/lib/treeNodeClick";
import { formatSqlInsert } from "@/lib/exportFormats"; import { formatSqlInsert } from "@/lib/exportFormats";
@@ -700,56 +700,58 @@ async function openData() {
const querySchema = connectionObjectTreeQuerySchema(config, node.database, tableSchema); const querySchema = connectionObjectTreeQuerySchema(config, node.database, tableSchema);
const effectiveDbType = effectiveDatabaseTypeForConnection(config); const effectiveDbType = effectiveDatabaseTypeForConnection(config);
const limit = settingsStore.editorSettings.pageSize; const limit = settingsStore.editorSettings.pageSize;
let columns: ColumnInfo[] = [];
let primaryKeys: string[] = [];
try {
console.info("[DBX][openData:get-columns:start]", {
traceId,
database: node.database,
schema: querySchema,
table: node.label,
elapsed: elapsed(),
});
columns = await api.getColumns(node.connectionId, node.database, querySchema, node.label);
primaryKeys = editablePrimaryKeys(effectiveDbType, columns);
console.info("[DBX][openData:get-columns:done]", {
traceId,
columnCount: columns.length,
primaryKeys,
elapsed: elapsed(),
});
queryStore.setTableMeta(tabId, {
schema: tableSchema,
tableName: node.label,
columns,
primaryKeys,
});
} catch (error) {
console.warn("[DBX][openData:get-columns:error]", { traceId, elapsed: elapsed(), error });
}
const includeRowId = usesSyntheticRowIdKey(effectiveDbType, primaryKeys);
const fallbackOrderColumns = effectiveDbType === "sqlserver" && !primaryKeys.length ? columns.slice(0, 1).map((column) => column.name) : undefined;
const sql = await buildTableSelectSql({ const sql = await buildTableSelectSql({
databaseType: effectiveDbType, databaseType: effectiveDbType,
schema: tableSchema, schema: tableSchema,
tableName: node.label, tableName: node.label,
columns: [], columns: columns.map((column) => column.name),
primaryKeys: [], primaryKeys,
fallbackOrderColumns,
limit, limit,
includeRowId: false, includeRowId,
}); });
console.info("[DBX][openData:sql-built]", { console.info("[DBX][openData:sql-built]", {
traceId, traceId,
primaryKeys: [], primaryKeys,
includeRowId: false, includeRowId,
sql, sql,
elapsed: elapsed(), elapsed: elapsed(),
}); });
queryStore.updateSql(tabId, sql); queryStore.updateSql(tabId, sql);
const loadTableMeta = async () => {
try {
console.info("[DBX][openData:get-columns:start]", {
traceId,
database: node.database,
schema: querySchema,
table: node.label,
elapsed: elapsed(),
});
const columns = await api.getColumns(node.connectionId, node.database, querySchema, node.label);
console.info("[DBX][openData:get-columns:done]", {
traceId,
columnCount: columns.length,
primaryKeys: columns.filter((column) => column.is_primary_key).map((column) => column.name),
elapsed: elapsed(),
});
const pks = editablePrimaryKeys(effectiveDbType, columns);
queryStore.setTableMeta(tabId, {
schema: tableSchema,
tableName: node.label,
columns,
primaryKeys: pks,
});
} catch (error) {
console.warn("[DBX][openData:get-columns:error]", { traceId, elapsed: elapsed(), error });
}
};
console.info("[DBX][openData:execute:start]", { traceId, tabId, elapsed: elapsed() }); console.info("[DBX][openData:execute:start]", { traceId, tabId, elapsed: elapsed() });
await queryStore.executeTabSql(tabId, sql); await queryStore.executeTabSql(tabId, sql);
console.info("[DBX][openData:execute:done]", { traceId, tabId, elapsed: elapsed() }); console.info("[DBX][openData:execute:done]", { traceId, tabId, elapsed: elapsed() });
void loadTableMeta();
} catch (e: any) { } catch (e: any) {
console.error("[DBX][openData:error]", { traceId, elapsed: elapsed(), error: e }); console.error("[DBX][openData:error]", { traceId, elapsed: elapsed(), error: e });
queryStore.setErrorResult(tabId, e); queryStore.setErrorResult(tabId, e);
+2 -2
View File
@@ -1325,7 +1325,7 @@ fn fix_potential_double_encoding(s: &str) -> String {
pub async fn get_columns(pool: &MySqlPool, database: &str, table: &str) -> Result<Vec<ColumnInfo>, String> { pub async fn get_columns(pool: &MySqlPool, database: &str, table: &str) -> Result<Vec<ColumnInfo>, String> {
let sql = columns_sql(database, table); let sql = columns_sql(database, table);
let mut conn = pool.get_conn().await.map_err(|e| e.to_string())?; let mut conn = get_conn_with_health_check(pool).await?;
let result = match conn.query_iter(&sql).await { let result = match conn.query_iter(&sql).await {
Ok(result) => result, Ok(result) => result,
Err(err) => { Err(err) => {
@@ -1375,7 +1375,7 @@ pub async fn get_columns(pool: &MySqlPool, database: &str, table: &str) -> Resul
pub async fn get_columns_show(pool: &MySqlPool, database: &str, table: &str) -> Result<Vec<ColumnInfo>, String> { pub async fn get_columns_show(pool: &MySqlPool, database: &str, table: &str) -> Result<Vec<ColumnInfo>, String> {
let sql = show_columns_sql(database, table, true); let sql = show_columns_sql(database, table, true);
let mut conn = pool.get_conn().await.map_err(|e| e.to_string())?; let mut conn = get_conn_with_health_check(pool).await?;
let rows: Vec<mysql_async::Row> = match conn.query_iter(&sql).await { let rows: Vec<mysql_async::Row> = match conn.query_iter(&sql).await {
Ok(result) => result.collect_and_drop().await.map_err(|e| e.to_string())?, Ok(result) => result.collect_and_drop().await.map_err(|e| e.to_string())?,
Err(_) => { Err(_) => {