fix(query): use tableMeta casing for result tab titles
This commit is contained in:
1 parent
3899aea866
commit
9ab1462ca8
2 files changed
+184
-4
No files matched your search
@@ -161,6 +161,8 @@ export interface EditorWorkspacePersistState {
|
||||
sizes: number[];
|
||||
}
|
||||
|
||||
export type QueryMetadataPatch = Pick<QueryTab, "queryAnalysis" | "querySourceColumns" | "queryWriteTargets" | "queryEditabilityReason" | "tableMeta" | "resultColumnComments" | "queryDisplaySourceColumns">;
|
||||
|
||||
interface BatchSqlResumeOptions {
|
||||
batch: BatchSqlExecution;
|
||||
previousResults: QueryResult[];
|
||||
@@ -651,6 +653,32 @@ function annotateQueryResultSource(result: QueryResult, sourceStatement: string,
|
||||
return result;
|
||||
}
|
||||
|
||||
export function canonicalizeQueryResultSourceLabel(currentLabel: string, sourceStatement: string, tableMeta: { tableName: string; schema?: string; database?: string }, options: { database?: string; databaseType?: DatabaseType } = {}): string | undefined {
|
||||
const canonicalTableName = tableMeta.tableName?.trim();
|
||||
if (!canonicalTableName) return undefined;
|
||||
|
||||
const autoLabel = queryResultSourceLabel(sourceStatement, options);
|
||||
if (!autoLabel || autoLabel.toLowerCase() !== currentLabel.toLowerCase()) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const lastDot = currentLabel.lastIndexOf(".");
|
||||
if (lastDot < 0) {
|
||||
return canonicalTableName;
|
||||
}
|
||||
|
||||
const existingQualifier = currentLabel.slice(0, lastDot);
|
||||
const lowerQualifier = existingQualifier.toLowerCase();
|
||||
let qualifier = existingQualifier;
|
||||
if (tableMeta.schema?.trim() && tableMeta.schema.trim().toLowerCase() === lowerQualifier) {
|
||||
qualifier = tableMeta.schema.trim();
|
||||
} else if (tableMeta.database?.trim() && tableMeta.database.trim().toLowerCase() === lowerQualifier) {
|
||||
qualifier = tableMeta.database.trim();
|
||||
}
|
||||
|
||||
return `${qualifier}.${canonicalTableName}`;
|
||||
}
|
||||
|
||||
function elasticsearchHttpErrorStatus(result: QueryResult): number | undefined {
|
||||
const statusIndex = result.columns.findIndex((column) => column.toLowerCase() === "status");
|
||||
if (statusIndex < 0) return undefined;
|
||||
@@ -5600,8 +5628,6 @@ export const useQueryStore = defineStore("query", () => {
|
||||
return producedResult;
|
||||
}
|
||||
|
||||
type QueryMetadataPatch = Pick<QueryTab, "queryAnalysis" | "querySourceColumns" | "queryWriteTargets" | "queryEditabilityReason" | "tableMeta" | "resultColumnComments" | "queryDisplaySourceColumns">;
|
||||
|
||||
type LoadedEditableSource = {
|
||||
source: EditableQuerySource;
|
||||
analysis: EditableQueryInfo;
|
||||
@@ -5710,7 +5736,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
return databaseType !== "oracle" || !!loaded.tableMeta.tableType?.trim();
|
||||
}
|
||||
|
||||
function applyQueryMetadataPatch(tab: QueryTab, patch: QueryMetadataPatch) {
|
||||
function applyQueryMetadataPatch(tab: QueryTab, patch: QueryMetadataPatch, databaseType?: DatabaseType, database?: string) {
|
||||
tab.queryAnalysis = patch.queryAnalysis;
|
||||
tab.querySourceColumns = patch.querySourceColumns;
|
||||
tab.queryWriteTargets = patch.queryWriteTargets;
|
||||
@@ -5719,6 +5745,18 @@ export const useQueryStore = defineStore("query", () => {
|
||||
tab.tableMeta = patch.tableMeta;
|
||||
tab.resultColumnComments = patch.resultColumnComments;
|
||||
tab.queryDisplaySourceColumns = patch.queryDisplaySourceColumns;
|
||||
|
||||
if (patch.tableMeta?.tableName && tab.result?.sourceStatement && tab.result.sourceLabel) {
|
||||
const nextLabel = canonicalizeQueryResultSourceLabel(tab.result.sourceLabel, tab.result.sourceStatement, patch.tableMeta, {
|
||||
database: database ?? tab.database,
|
||||
databaseType,
|
||||
});
|
||||
if (nextLabel) {
|
||||
tab.result.sourceLabel = nextLabel;
|
||||
const matching = tab.results?.find((result) => result === tab.result);
|
||||
if (matching) matching.sourceLabel = nextLabel;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function resolveEditableSourceMetadataTarget(tab: QueryTab, analysis: EditableQueryInfo, source: EditableQuerySource, conn: ConnectionConfig | undefined, dbType: string, executionDatabase: string): EditableSourceMetadataTarget {
|
||||
@@ -6331,7 +6369,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
}
|
||||
const current = tabs.value.find((t) => t.id === tabId);
|
||||
if (patch && current?.result === result) {
|
||||
applyQueryMetadataPatch(current, patch);
|
||||
applyQueryMetadataPatch(current, patch, databaseType, executionDatabase);
|
||||
syncActiveResultRunFromDisplayed(current);
|
||||
queryExecutionLog("info", "metadata:done", { traceId, elapsed: elapsed() });
|
||||
} else {
|
||||
@@ -9248,6 +9286,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
countTabResultRows,
|
||||
buildQueryResultExportRequest,
|
||||
exportQuerySqlDirect,
|
||||
applyQueryMetadataPatch,
|
||||
getResourceLifecycleDiagnostics: () => resourceLifecycleDiagnostics(tabs.value),
|
||||
notifyConnectionMayBeLost,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user