fix(query): propagate schema reset close failures
This commit is contained in:
7 files changed
+289
-15
No files matched your search
@@ -15,7 +15,7 @@ import { connectionIconType } from "@/lib/connection/connectionPresentation";
|
||||
import { formatDatabaseLabel, isDefaultDatabase } from "@/lib/database/defaultDatabase";
|
||||
import { connectionDisplayName } from "@/lib/tabs/tabPresentation";
|
||||
import { buildConnectionGroupPathMap } from "@/lib/sidebar/sidebarLayout";
|
||||
import { isSingleDatabase, supportsSqlInListPaste, supportsTransaction as supportsTransactionFeature } from "@/lib/database/databaseCapabilities";
|
||||
import { isSingleDatabase, supportsClearableQuerySchema, supportsSqlInListPaste, supportsTransaction as supportsTransactionFeature } from "@/lib/database/databaseCapabilities";
|
||||
import { hexToRgba } from "@/lib/common/color";
|
||||
import { productionContextForDatabase } from "@/lib/database/productionSafety";
|
||||
import type { QueryTab, ConnectionConfig } from "@/types/database";
|
||||
@@ -411,6 +411,7 @@ function databaseOptionIsProduction(database: string): boolean {
|
||||
:empty-text="t('grid.noSearchResults')"
|
||||
:loading-text="t('common.loading')"
|
||||
:loading="!!activeConnection && isLoadingSchemas(activeConnection.id, schemaDatabaseKey)"
|
||||
:clear-selected-option="supportsClearableQuerySchema(activeConnection?.db_type)"
|
||||
trigger-class="gap-1.5"
|
||||
@update:model-value="(schema) => emit('changeSchema', schema || undefined)"
|
||||
@update:open="
|
||||
|
||||
@@ -33,12 +33,14 @@ const props = withDefaults(
|
||||
optionTooltip?: (option: string) => string | undefined;
|
||||
normalizeCustom?: (value: string) => string;
|
||||
clearable?: boolean;
|
||||
clearSelectedOption?: boolean;
|
||||
}>(),
|
||||
{
|
||||
loading: false,
|
||||
disabled: false,
|
||||
allowCustom: false,
|
||||
clearable: false,
|
||||
clearSelectedOption: false,
|
||||
loadingText: "Loading...",
|
||||
triggerVariant: "ghost",
|
||||
triggerIconClass: "h-3 w-3",
|
||||
@@ -183,6 +185,10 @@ function selectOption(option: string) {
|
||||
open.value = false;
|
||||
}
|
||||
|
||||
function selectOrClearOption(option: string) {
|
||||
selectOption(props.clearSelectedOption && option === props.modelValue ? "" : option);
|
||||
}
|
||||
|
||||
function selectCustomOption() {
|
||||
if (!canSelectCustom.value) return;
|
||||
selectOption(customOptionValue.value);
|
||||
@@ -214,7 +220,7 @@ function handleKeydown(event: KeyboardEvent) {
|
||||
if (highlightIndex.value < 0 || highlightIndex.value >= optionCount()) return;
|
||||
event.preventDefault();
|
||||
if (highlightIndex.value < filteredOptions.value.length) {
|
||||
selectOption(filteredOptions.value[highlightIndex.value]);
|
||||
selectOrClearOption(filteredOptions.value[highlightIndex.value]);
|
||||
} else {
|
||||
selectCustomOption();
|
||||
}
|
||||
@@ -255,15 +261,18 @@ function handleKeydown(event: KeyboardEvent) {
|
||||
:title="optionTooltip(option) ? undefined : optionTitle(option)"
|
||||
:class="
|
||||
cn(
|
||||
'flex h-8 w-full min-w-0 items-center gap-2 rounded-sm px-2 text-left text-sm hover:bg-accent hover:text-accent-foreground focus-visible:bg-accent focus-visible:text-accent-foreground focus-visible:outline-none',
|
||||
'group flex h-8 w-full min-w-0 items-center gap-2 rounded-sm px-2 text-left text-sm hover:bg-accent hover:text-accent-foreground focus-visible:bg-accent focus-visible:text-accent-foreground focus-visible:outline-none',
|
||||
props.itemClass,
|
||||
index === highlightIndex && 'bg-accent text-accent-foreground',
|
||||
)
|
||||
"
|
||||
@pointerenter="activateHelpForOption(option)"
|
||||
@click="selectOption(option)"
|
||||
@click="selectOrClearOption(option)"
|
||||
>
|
||||
<Check :class="cn('h-3.5 w-3.5 shrink-0', option === modelValue ? 'opacity-100' : 'opacity-0')" />
|
||||
<span class="relative h-3.5 w-3.5 shrink-0">
|
||||
<Check :class="cn('absolute inset-0 h-3.5 w-3.5', option !== modelValue ? 'opacity-0' : clearSelectedOption ? 'opacity-100 group-hover:opacity-0 group-focus-visible:opacity-0' : 'opacity-100')" />
|
||||
<X v-if="clearSelectedOption && option === modelValue" class="absolute inset-0 h-3.5 w-3.5 opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100" />
|
||||
</span>
|
||||
<slot name="option-label" :option="option" :label="displayName?.(option)">
|
||||
<span class="truncate">{{ displayName?.(option) }}</span>
|
||||
</slot>
|
||||
|
||||
@@ -39,6 +39,8 @@ export const SCHEMA_AWARE_TYPES = new Set<DatabaseType>([
|
||||
|
||||
export const SINGLE_DATABASE_TYPES = new Set<DatabaseType>(["oracle", "dameng", "firebird", "oceanbase-oracle", "access", "questdb"]);
|
||||
|
||||
export const CLEARABLE_QUERY_SCHEMA_TYPES = new Set<DatabaseType>(["oracle", "dameng", "oceanbase-oracle"]);
|
||||
|
||||
export const FETCH_FIRST_TYPES = new Set<DatabaseType>(["oracle", "dameng"]);
|
||||
|
||||
export const TREE_SCHEMA_TYPES = new Set<DatabaseType>([
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { ConnectionConfig, DatabaseType, TreeNodeType } from "@/types/database";
|
||||
import { supportsDatabaseFeature } from "@/lib/database/databaseDriverManifest";
|
||||
import { canEditTableStructure } from "@/lib/table/tableStructureCapabilities";
|
||||
import { DATABASE_OBJECT_TREE_TYPES, FETCH_FIRST_TYPES, PG_LIKE_STRUCTURE_TYPES, SCHEMA_AWARE_TYPES, SINGLE_DATABASE_TYPES, TREE_SCHEMA_TYPES } from "@/lib/database/databaseCapabilitySets";
|
||||
import { CLEARABLE_QUERY_SCHEMA_TYPES, DATABASE_OBJECT_TREE_TYPES, FETCH_FIRST_TYPES, PG_LIKE_STRUCTURE_TYPES, SCHEMA_AWARE_TYPES, SINGLE_DATABASE_TYPES, TREE_SCHEMA_TYPES } from "@/lib/database/databaseCapabilitySets";
|
||||
|
||||
export function isSchemaAware(dbType?: DatabaseType): boolean {
|
||||
return !!dbType && SCHEMA_AWARE_TYPES.has(dbType);
|
||||
@@ -59,6 +59,10 @@ export function isSingleDatabase(dbType?: DatabaseType): boolean {
|
||||
return !!dbType && SINGLE_DATABASE_TYPES.has(dbType);
|
||||
}
|
||||
|
||||
export function supportsClearableQuerySchema(dbType?: DatabaseType): boolean {
|
||||
return !!dbType && CLEARABLE_QUERY_SCHEMA_TYPES.has(dbType);
|
||||
}
|
||||
|
||||
export function usesFetchFirst(dbType?: DatabaseType): boolean {
|
||||
return !!dbType && FETCH_FIRST_TYPES.has(dbType);
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ import { redisCommandResultToQueryResult } from "@/lib/redis/redisQueryResult";
|
||||
import { nextRedisCommandDb } from "@/lib/redis/redisCommandSession";
|
||||
import { isRedisMutatingCommand } from "@/lib/redis/redisCommandTable";
|
||||
import { usesAgentCursorForQuery } from "@/lib/database/databaseDriverManifest";
|
||||
import { supportsClearableQuerySchema } from "@/lib/database/databaseFeatureSupport";
|
||||
import { canUseKeylessRowPredicate, DBX_ROWID_COLUMN, editablePrimaryKeys, usesSyntheticRowIdKey } from "@/lib/table/tableEditing";
|
||||
import { TABLE_DATA_EXPORT_PAGE_SIZE } from "@/lib/table/tableDataExport";
|
||||
import { tableMetaForDataTab } from "@/lib/table/tableDataTabMeta";
|
||||
@@ -357,6 +358,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
const closeConfirmContext = ref<CloseConfirmContext>("tab");
|
||||
const tableStructureRefreshVersions = ref<Record<string, number>>({});
|
||||
const savedSqlEditorPositionTimers = new Map<string, ReturnType<typeof setTimeout>>();
|
||||
const pendingTabSessionResets = new Map<string, Promise<void>>();
|
||||
let resultCacheTrimScheduled = false;
|
||||
let resultCacheTrimRunning = false;
|
||||
let resultCacheTrimRequested = false;
|
||||
@@ -379,7 +381,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
}
|
||||
const MAX_CACHED_RESULTS = 5;
|
||||
|
||||
async function closeResultSession(tab: QueryTab | undefined, preserveSessionId?: string) {
|
||||
async function closeResultSession(tab: QueryTab | undefined, preserveSessionId?: string, throwOnError = false) {
|
||||
const sessionId = tab?.resultSessionId ?? tab?.result?.session_id;
|
||||
if (!tab || !sessionId || sessionId === preserveSessionId) return;
|
||||
try {
|
||||
@@ -389,28 +391,54 @@ export const useQueryStore = defineStore("query", () => {
|
||||
await api.closeQuerySession(tab.connectionId, executionDatabase, sessionId, tab.id);
|
||||
} catch (error) {
|
||||
console.warn("[DBX][query-session:close:error]", { tabId: tab.id, sessionId, error });
|
||||
if (throwOnError) throw error;
|
||||
} finally {
|
||||
if (tab.resultSessionId === sessionId) tab.resultSessionId = undefined;
|
||||
if (tab.result?.session_id === sessionId) tab.result.session_id = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
async function closeClientSessionId(connectionId: string, database: string, clientSessionId: string, logContext: Record<string, unknown> = {}) {
|
||||
async function closeClientSessionId(connectionId: string, database: string, clientSessionId: string, logContext: Record<string, unknown> = {}, throwOnError = false) {
|
||||
try {
|
||||
await api.closeClientConnectionSession(connectionId, database, clientSessionId);
|
||||
} catch (error) {
|
||||
console.warn("[DBX][client-session:close:error]", { ...logContext, clientSessionId, error });
|
||||
if (throwOnError) throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function closeClientConnectionSession(tab: QueryTab | undefined) {
|
||||
async function closeClientConnectionSession(tab: QueryTab | undefined, throwOnError = false) {
|
||||
if (!tab?.connectionId) return;
|
||||
const catalog = tab.mode === "data" ? tab.tableMeta?.catalog : undefined;
|
||||
const connection = catalog ? useConnectionStore().getConfig(tab.connectionId) : undefined;
|
||||
const executionDatabase = dataTabExecutionDatabase(connection, tab.database, catalog);
|
||||
const clientSessionIds = [...new Set([tabClientSessionId(tab), ...BACKGROUND_CLIENT_SESSION_SUFFIXES.map((suffix) => tabClientSessionId(tab, suffix)), tab.explainClientSessionId].filter((sessionId): sessionId is string => !!sessionId))];
|
||||
for (const clientSessionId of clientSessionIds) {
|
||||
await closeClientSessionId(tab.connectionId, executionDatabase, clientSessionId, { tabId: tab.id });
|
||||
await closeClientSessionId(tab.connectionId, executionDatabase, clientSessionId, { tabId: tab.id }, throwOnError);
|
||||
}
|
||||
}
|
||||
|
||||
function queueTabSessionReset(tab: QueryTab) {
|
||||
const previousReset = pendingTabSessionResets.get(tab.id);
|
||||
const reset = (async () => {
|
||||
if (previousReset) await previousReset;
|
||||
// A schema reset must fail closed: reusing the old session would retain Oracle CURRENT_SCHEMA.
|
||||
await closeResultSession(tab, undefined, true);
|
||||
await closeClientConnectionSession(tab, true);
|
||||
})();
|
||||
pendingTabSessionResets.set(tab.id, reset);
|
||||
const clearPendingReset = () => {
|
||||
if (pendingTabSessionResets.get(tab.id) === reset) pendingTabSessionResets.delete(tab.id);
|
||||
};
|
||||
void reset.then(clearPendingReset, clearPendingReset);
|
||||
}
|
||||
|
||||
async function waitForTabSessionReset(tabId: string) {
|
||||
while (true) {
|
||||
const pendingReset = pendingTabSessionResets.get(tabId);
|
||||
if (!pendingReset) return;
|
||||
await pendingReset;
|
||||
if (pendingTabSessionResets.get(tabId) === pendingReset) pendingTabSessionResets.delete(tabId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1985,6 +2013,15 @@ export const useQueryStore = defineStore("query", () => {
|
||||
const tab = tabs.value.find((t) => t.id === id);
|
||||
if (!tab || tab.schema === schema) return;
|
||||
rollbackTabTransaction(tab);
|
||||
const clearsQuerySchema = tab.mode === "query" && tab.schema && !schema && supportsClearableQuerySchema(useConnectionStore().getConfig(tab.connectionId)?.db_type);
|
||||
if (clearsQuerySchema) {
|
||||
queueTabSessionReset(tab);
|
||||
clearResultPayload(tab);
|
||||
tab.lastExecutedSql = undefined;
|
||||
tab.resultBaseSql = undefined;
|
||||
tab.resultSortedSql = undefined;
|
||||
clearExplain(tab);
|
||||
}
|
||||
tab.schema = schema;
|
||||
if (tab.mode === "objects") tab.objectBrowser = { ...tab.objectBrowser, schema, viewport: undefined };
|
||||
}
|
||||
@@ -2605,6 +2642,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
let countSql: string | undefined;
|
||||
let useAgentResultSession = false;
|
||||
try {
|
||||
await waitForTabSessionReset(id);
|
||||
const connStore = useConnectionStore();
|
||||
let conn = connStore.getConfig(tab.connectionId);
|
||||
const parsedMongoCommands = conn?.db_type === "mongodb" ? splitMongoCommandRanges(sql) : undefined;
|
||||
@@ -3209,6 +3247,16 @@ export const useQueryStore = defineStore("query", () => {
|
||||
tab.explainTableSql = undefined;
|
||||
tab.lastExplainedSql = sql;
|
||||
|
||||
try {
|
||||
await waitForTabSessionReset(id);
|
||||
} catch (e: any) {
|
||||
// Do not start an explain with a session whose schema reset did not complete.
|
||||
tab.isExplaining = false;
|
||||
tab.explainExecutionId = undefined;
|
||||
tab.explainError = String(e?.message || e);
|
||||
return { ok: false as const, reason: tab.explainError };
|
||||
}
|
||||
|
||||
// DM and Oracle agents expose native text plans. DM also supports autotrace.
|
||||
if (databaseType === "dameng" || databaseType === "oracle") {
|
||||
let explainSql = sql;
|
||||
|
||||
Reference in new issue
Block a user