fix(connection): move query timeout into per-connection settings
This commit is contained in:
1 parent
9f72c38253
commit
486d9bb3a6
20 files changed
+97
-60
No files matched your search
@@ -191,8 +191,6 @@ export interface EditorSettings {
|
||||
columnFormatters: Record<string, ColumnFormatterConfig>;
|
||||
customColumnFormatters: Record<string, CustomColumnFormatterConfig>;
|
||||
snippets: SqlSnippet[];
|
||||
/** Query timeout in seconds. 0 = no timeout. Default 30s. */
|
||||
queryTimeoutSecs: number;
|
||||
}
|
||||
|
||||
export const EDITOR_THEMES: { value: EditorTheme; label: string; dark: boolean }[] = [
|
||||
@@ -242,7 +240,6 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
|
||||
columnFormatters: {},
|
||||
customColumnFormatters: {},
|
||||
snippets: DEFAULT_SQL_SNIPPETS,
|
||||
queryTimeoutSecs: 30,
|
||||
};
|
||||
|
||||
export const STORAGE_KEY = "dbx-editor-settings";
|
||||
@@ -301,11 +298,6 @@ function normalizeSqlSnippets(value: unknown, existing?: SqlSnippet[]): SqlSnipp
|
||||
return valid;
|
||||
}
|
||||
|
||||
function normalizeQueryTimeoutSecs(value: unknown): number {
|
||||
if (typeof value === "number" && Number.isFinite(value) && value >= 0) return value;
|
||||
return DEFAULT_EDITOR_SETTINGS.queryTimeoutSecs;
|
||||
}
|
||||
|
||||
export function normalizeEditorSettings(settings: Partial<EditorSettings>, existing?: EditorSettings): EditorSettings {
|
||||
return {
|
||||
fontFamily: settings.fontFamily ?? DEFAULT_EDITOR_SETTINGS.fontFamily,
|
||||
@@ -335,7 +327,6 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
||||
columnFormatters: normalizeColumnFormatters(settings.columnFormatters),
|
||||
customColumnFormatters: normalizeCustomColumnFormatters(settings.customColumnFormatters),
|
||||
snippets: normalizeSqlSnippets(settings.snippets, existing?.snippets),
|
||||
queryTimeoutSecs: normalizeQueryTimeoutSecs(settings.queryTimeoutSecs),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -464,8 +455,6 @@ export const useSettingsStore = defineStore("settings", () => {
|
||||
if (partial.customColumnFormatters !== undefined)
|
||||
editorSettings.value.customColumnFormatters = partial.customColumnFormatters;
|
||||
if (partial.snippets !== undefined) editorSettings.value.snippets = normalizeSqlSnippets(partial.snippets);
|
||||
if (partial.queryTimeoutSecs !== undefined)
|
||||
editorSettings.value.queryTimeoutSecs = normalizeQueryTimeoutSecs(partial.queryTimeoutSecs);
|
||||
saveEditorSettings(editorSettings.value);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user