fix(saved-sql): auto-number duplicate saved SQL file names

This commit is contained in:
zipg authored and GitHub committed 2026-10-03 13:43:39 +08:00
1 parent 1bd38f1d6e
commit 8dc1297f6a
18 files changed
+266 -50

No files matched your search

+75 -24
View File
@@ -483,6 +483,10 @@ const showMultiDbExecuteDialog = ref(false);
const multiExecuteSql = ref("");
const multiExecuteSourceTabId = ref("");
const saveSqlName = ref("");
// The name we suggested from the tab title. Only a name that is still
// untouched can be auto-adjusted on a conflict — a name the user typed is
// never quietly saved under a different one.
const autoGeneratedSaveSqlName = ref<string | null>(null);
const ROOT_SAVED_SQL_FOLDER = "__root__";
const { selection: saveSqlFolderId, pending: saveSqlFolderCreationPending, reset: resetSaveSqlFolderSelection, invalidate: invalidateSaveSqlFolderSelection, select: selectSaveSqlFolder } = useSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER);
const pendingSaveAndCloseTabId = ref<string | null>(null);
@@ -1943,6 +1947,20 @@ function defaultSavedSqlName(title: string) {
return normalized.endsWith(".sql") ? normalized : `${normalized}.sql`;
}
function selectedSaveSqlFolderId(): string | undefined {
return saveSqlFolderId.value === ROOT_SAVED_SQL_FOLDER ? undefined : saveSqlFolderId.value;
}
function setAutoSaveSqlName(tab: QueryTab) {
const name = defaultSavedSqlName(tab.title);
saveSqlName.value = name;
autoGeneratedSaveSqlName.value = name;
}
function saveSqlDialogTab(): QueryTab | undefined {
return saveSqlDialogTabId.value ? queryStore.tabs.find((candidate) => candidate.id === saveSqlDialogTabId.value) : activeTab.value;
}
function notifySqlLibrarySaved() {
sqlLibrarySaveFeedbackId.value += 1;
toast(t("savedSql.saved"), 2000);
@@ -2314,8 +2332,8 @@ async function handleSaveTab(tabId: string) {
const prevActive = queryStore.activeTabId;
queryStore.activateTab(tabId);
saveSqlDialogTabId.value = tabId;
saveSqlName.value = defaultSavedSqlName(tab.title);
resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER);
setAutoSaveSqlName(tab);
pendingSaveAndCloseTabId.value = tabId;
pendingPrevActiveTabId.value = prevActive;
showSaveSqlDialog.value = true;
@@ -2353,8 +2371,8 @@ async function openSaveSqlDialog(tabId?: string) {
return;
}
saveSqlName.value = defaultSavedSqlName(tab.title);
resetSaveSqlFolderSelection(ROOT_SAVED_SQL_FOLDER);
setAutoSaveSqlName(tab);
showSaveSqlDialog.value = true;
}
@@ -2416,7 +2434,7 @@ async function handleSaveSqlFolderSelect(value: string) {
await selectSaveSqlFolder(value);
return;
}
const tab = saveSqlDialogTabId.value ? queryStore.tabs.find((candidate) => candidate.id === saveSqlDialogTabId.value) : activeTab.value;
const tab = saveSqlDialogTab();
if (!tab) return;
await selectSaveSqlFolder(
value,
@@ -2425,32 +2443,64 @@ async function handleSaveSqlFolderSelect(value: string) {
);
}
// Tab titles are a per-session counter (`query_<n>`), so a generated name can
// already be taken in the target folder. Following the store's suggestion is
// bounded: a concurrent save can claim the suggested name too.
const SAVE_SQL_NAME_ATTEMPTS = 3;
/** The free name a name conflict points at, or undefined when the caller picked the name. */
function autoAdjustedSaveName(error: unknown, attemptedName: string): string | undefined {
if (autoGeneratedSaveSqlName.value === null || saveSqlName.value !== autoGeneratedSaveSqlName.value) return undefined;
const conflict = error as { code?: unknown; suggestedName?: unknown } | null;
if (conflict?.code !== "SAVED_SQL_NAME_CONFLICT" || typeof conflict.suggestedName !== "string") return undefined;
if (conflict.suggestedName === attemptedName) return undefined;
return conflict.suggestedName;
}
async function confirmSaveSqlToLibrary() {
if (saveSqlFolderCreationPending.value) return;
const tab = saveSqlDialogTabId.value ? queryStore.tabs.find((candidate) => candidate.id === saveSqlDialogTabId.value) : activeTab.value;
const tab = saveSqlDialogTab();
const name = saveSqlName.value.trim();
if (!tab || !tab.sql.trim() || !name) return;
const flyOrigin = elementCenter(saveSqlConfirmButtonElement());
try {
const target = savedSqlTargetForSave(tab);
const saved = await savedSqlStore.saveFile({
id: tab.savedSqlId,
connectionId: target.connectionId,
folderId: saveSqlFolderId.value === ROOT_SAVED_SQL_FOLDER ? undefined : saveSqlFolderId.value,
name: defaultSavedSqlName(name),
database: target.database,
catalog: target.catalog,
schema: target.schema,
sql: await formattedSqlForSave(tab),
});
queryStore.linkSavedSql(tab.id, saved.id, saved.name);
queryStore.markTabClean(tab);
showSaveSqlDialog.value = false;
saveSqlDialogTabId.value = null;
closePendingSavedTab();
void notifyNewSqlLibrarySaved(flyOrigin);
} catch (e: any) {
toast(t("savedSql.saveFailed", { message: savedSqlErrorMessage(e, t) }), 5000);
const target = savedSqlTargetForSave(tab);
const sql = await formattedSqlForSave(tab);
let saveName = defaultSavedSqlName(name);
let adjusted = false;
for (let attempt = 0; ; attempt++) {
try {
const saved = await savedSqlStore.saveFile({
id: tab.savedSqlId,
connectionId: target.connectionId,
folderId: selectedSaveSqlFolderId(),
name: saveName,
database: target.database,
catalog: target.catalog,
schema: target.schema,
sql,
});
queryStore.linkSavedSql(tab.id, saved.id, saved.name);
queryStore.markTabClean(tab);
showSaveSqlDialog.value = false;
saveSqlDialogTabId.value = null;
closePendingSavedTab();
if (!adjusted) void notifyNewSqlLibrarySaved(flyOrigin);
else {
toast(t("savedSql.nameAdjusted", { name: saved.name }), 3000);
sqlLibrarySaveFeedbackId.value += 1;
}
return;
} catch (e: any) {
const retryName = attempt < SAVE_SQL_NAME_ATTEMPTS - 1 ? autoAdjustedSaveName(e, saveName) : undefined;
if (!retryName) {
toast(t("savedSql.saveFailed", { message: savedSqlErrorMessage(e, t) }), 5000);
return;
}
adjusted = true;
saveName = retryName;
saveSqlName.value = retryName;
autoGeneratedSaveSqlName.value = retryName;
}
}
}
@@ -4815,6 +4865,7 @@ onUnmounted(() => {
showSaveSqlDialog = open;
if (!open) {
invalidateSaveSqlFolderSelection();
autoGeneratedSaveSqlName = null;
saveSqlDialogTabId = null;
if (pendingSaveAndCloseTabId) cancelPendingSaveAndClose();
}