Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(sql-file): support folder management

二丫讲梵72a86b56ac28
diff --git a/apps/desktop/src/components/layout/SqlFilePanel.vue b/apps/desktop/src/components/layout/SqlFilePanel.vue
index 882c5429aa..495b43f595 100644
--- a/apps/desktop/src/components/layout/SqlFilePanel.vue
+++ b/apps/desktop/src/components/layout/SqlFilePanel.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { ref, computed, nextTick, onMounted } from "vue";
import { useI18n } from "vue-i18n";
-import { FolderOpen, FileCode, FolderClosed, ChevronRight, ChevronDown, X, Trash2, RefreshCw, FolderSearch, Copy, Play, ChevronsUpDown, ChevronsDownUp, Settings, FilePlus, Pencil, LocateFixed } from "@lucide/vue";
+import { FolderOpen, FolderClosed, FileCode, FolderPlus, ChevronRight, ChevronDown, X, Trash2, RefreshCw, FolderSearch, Copy, Play, ChevronsUpDown, ChevronsDownUp, Settings, FilePlus, Pencil, LocateFixed } from "@lucide/vue";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
@@ -16,8 +16,8 @@ import { useToast } from "@/composables/useToast";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { translateBackendError } from "@/i18n/backend-errors";
import { copyToClipboard } from "@/lib/common/clipboard";
-import { forgetExternalSqlFileTarget, moveExternalSqlFileTarget, resolveExternalSqlFileTargetForActiveTab } from "@/lib/sql/externalSqlFileTarget";
-import { externalSqlFileOpenErrorMessage, externalSqlEditorMaxBytes, formatSqlFileSize, isExternalSqlFileTooLargeError, isSqlFilePath, normalizeExternalSqlPath } from "@/lib/sql/sqlFileOpen";
+import { forgetExternalSqlFileTarget, forgetExternalSqlFolderTargets, moveExternalSqlFileTarget, moveExternalSqlFolderTargets, resolveExternalSqlFileTargetForActiveTab } from "@/lib/sql/externalSqlFileTarget";
+import { externalSqlFileOpenErrorMessage, externalSqlEditorMaxBytes, formatSqlFileSize, isExternalSqlFileTooLargeError, isSqlFilePath, normalizeExternalSqlPath, relocateExternalSqlPathWithinFolder } from "@/lib/sql/sqlFileOpen";
import * as api from "@/lib/backend/api";
import type { SqlFileEntry } from "@/lib/backend/api";
import { getSqlFileFilter, getSqlFileFolderPaths, saveSqlFileFilter, saveSqlFileFolderPaths, notifySqlFileFoldersChanged } from "@/lib/sqlFile/sqlFileFolders";
@@ -54,11 +54,17 @@ type ContextTarget = { kind: "panel" } | { kind: "folderHeader"; folderPath: str
const contextTarget = ref<ContextTarget | null>(null);
const createTarget = ref<{ rootPath: string; directoryPath: string } | null>(null);
const renameTarget = ref<Extract<ContextTarget, { kind: "file" }> | null>(null);
+const renameFolderTarget = ref<Extract<ContextTarget, { kind: "dir" }> | null>(null);
const deleteTarget = ref<Extract<ContextTarget, { kind: "file" }> | null>(null);
+const deleteFolderTarget = ref<Extract<ContextTarget, { kind: "dir" }> | null>(null);
const fileNameInput = ref("");
const showCreateDialog = ref(false);
+const showCreateFolderDialog = ref(false);
+const folderMutationPending = ref(false);
const showRenameDialog = ref(false);
+const showRenameFolderDialog = ref(false);
const showDeleteDialog = ref(false);
+const showDeleteFolderDialog = ref(false);
const selectedPaths = ref<Set<string>>(new Set());
const activePath = ref<string | null>(null);
@@ -164,7 +170,7 @@ async function loadFolderEntries(folderPath: string): Promise<string | null> {
if (idx === -1) return null;
folders.value[idx].loading = true;
try {
- const entries = await api.listSqlFilesInFolder(folderPath, getSqlFileFilter());
+ const entries = await api.listSqlFilesInFolder(folderPath, getSqlFileFilter(), true);
const target = folders.value.findIndex((f) => f.path === folderPath);
if (target !== -1) {
folders.value[target].entries = entries;
@@ -172,11 +178,17 @@ async function loadFolderEntries(folderPath: string): Promise<string | null> {
// stale entries don't keep phantom directories open.
const stillPresent = new Set<string>();
collectPaths(entries, stillPresent);
+ // Mutations compare normalized paths, while the scanner retains native
+ // separators. Rebind UI state to the actual returned node identities.
+ const displayPaths = new Map([...stillPresent, folderPath].map((path) => [normalizeExternalSqlPath(path), path]));
const nextExpanded = new Set<string>();
for (const p of folders.value[target].expanded) {
- if (stillPresent.has(p)) nextExpanded.add(p);
+ const displayPath = displayPaths.get(normalizeExternalSqlPath(p));
+ if (displayPath && stillPresent.has(displayPath)) nextExpanded.add(displayPath);
}
folders.value[target].expanded = nextExpanded;
+ selectedPaths.value = new Set([...selectedPaths.value].map((path) => displayPaths.get(normalizeExternalSqlPath(path)) ?? path));
+ if (activePath.value) activePath.value = displayPaths.get(normalizeExternalSqlPath(activePath.value)) ?? activePath.value;
}
} catch (e: any) {
const message = e?.message || String(e);
@@ -434,6 +446,72 @@ function openCreateDialog(rootPath: string, directoryPath: string) {
showCreateDialog.value = true;
}
+function isWithinFolder(path: string, folderPath: string) {
+ const normalized = normalizeExternalSqlPath(path);
+ const root = normalizeExternalSqlPath(folderPath);
+ return normalized === root || normalized.startsWith(`${root}/`);
+}
+
+function updateFolderPaths(previousPath: string, nextPath?: string) {
+ const previous = normalizeExternalSqlPath(previousPath);
+ const mapPath = (path: string) => {
+ if (!isWithinFolder(path, previous)) return path;
+ return nextPath ? (relocateExternalSqlPathWithinFolder(path, previousPath, nextPath) ?? path) : null;
+ };
+ const mapSet = (paths: Set<string>) => new Set([...paths].map(mapPath).filter((path): path is string => path !== null));
+ folders.value = folders.value.filter((folder) => {
+ const mapped = mapPath(folder.path);
+ if (mapped === null) return false;
+ folder.path = mapped;
+ folder.expanded = mapSet(folder.expanded);
+ return true;
+ });
+ selectedPaths.value = mapSet(selectedPaths.value);
+ activePath.value = activePath.value ? mapPath(activePath.value) : null;
+ selectionAnchorIndex.value = null;
+ saveFolders();
+}
+
+async function refreshMutationFolders() {
+ await Promise.all(folders.value.map((folder) => loadFolderEntries(folder.path)));
+ notifySqlFileFoldersChanged();
+}
+
+function openCreateFolderDialog(rootPath: string, directoryPath: string) {
+ if (folderMutationPending.value) return;
+ createTarget.value = { rootPath, directoryPath };
+ fileNameInput.value = "";
+ showCreateFolderDialog.value = true;
+}
+
+async function createSqlFolder() {
+ const target = createTarget.value;
+ if (folderMutationPending.value || !target || !fileNameInput.value.trim()) return;
+ folderMutationPending.value = true;
+ try {
+ const path = await api.createSqlFolderInFolder(target.rootPath, target.directoryPath, fileNameInput.value.trim());
+ showCreateFolderDialog.value = false;
+ await refreshMutationFolders();
+ const folder = folders.value.find((item) => item.path === target.rootPath);
+ if (folder) {
+ folder.collapsed = false;
+ folder.expanded = new Set([...folder.expanded, target.directoryPath, path]);
+ }
+ activePath.value = path;
+ selectedPaths.value = new Set();
+ selectionAnchorIndex.value = null;
+ await nextTick();
+ Array.from(fileTree.value?.querySelectorAll<HTMLElement>("[data-sql-file-path]") ?? [])
+ .find((row) => row.dataset.sqlFilePath === path)
+ ?.scrollIntoView({ block: "nearest" });
+ toast(t("sqlFileTree.folderCreated"), 1500);
+ } catch (e: any) {
+ toast(t("sqlFileTree.createFolderFailed", { message: translateBackendError(t, e) }), 5000);
+ } finally {
+ folderMutationPending.value = false;
+ }
+}
+
async function createSqlFile() {
const target = createTarget.value;
if (!target || !fileNameInput.value.trim()) return;
@@ -454,6 +532,32 @@ function openRenameDialog(target: Extract<ContextTarget, { kind: "file" }>) {
showRenameDialog.value = true;
}
+function openRenameFolderDialog(target: Extract<ContextTarget, { kind: "dir" }>) {
+ if (folderMutationPending.value) return;
+ renameFolderTarget.value = target;
+ fileNameInput.value = target.entry.name;
+ showRenameFolderDialog.value = true;
+}
+
+async function renameSqlFolder() {
+ const target = renameFolderTarget.value;
+ if (folderMutationPending.value || !target || !fileNameInput.value.trim()) return;
+ folderMutationPending.value = true;
+ try {
+ const nextPath = await api.renameSqlFolderInFolder(target.folderPath, target.entry.path, fileNameInput.value.trim());
+ queryStore.relocateExternalSqlFolderPath(target.entry.path, nextPath);
+ moveExternalSqlFolderTargets(target.entry.path, nextPath);
+ updateFolderPaths(target.entry.path, nextPath);
+ showRenameFolderDialog.value = false;
+ await refreshMutationFolders();
+ toast(t("sqlFileTree.folderRenamed"), 1500);
+ } catch (e: any) {
+ toast(t("sqlFileTree.renameFolderFailed", { message: translateBackendError(t, e) }), 5000);
+ } finally {
+ folderMutationPending.value = false;
+ }
+}
+
async function renameSqlFile() {
const target = renameTarget.value;
if (!target || !fileNameInput.value.trim()) return;
@@ -476,6 +580,52 @@ function openDeleteDialog(target: Extract<ContextTarget, { kind: "file" }>) {
showDeleteDialog.value = true;
}
+function openDeleteFolderDialog(target: Extract<ContextTarget, { kind: "dir" }>) {
+ if (folderMutationPending.value) return;
+ deleteFolderTarget.value = target;
+ showDeleteFolderDialog.value = true;
+}
+
+async function deleteSqlFolder() {
+ const target = deleteFolderTarget.value;
+ if (folderMutationPending.value || !target) return;
+ folderMutationPending.value = true;
+ try {
+ await api.deleteSqlFolderInFolder(target.folderPath, target.entry.path);
+ queryStore.markExternalSqlFolderMissingForPath(target.entry.path);
+ forgetExternalSqlFolderTargets(target.entry.path);
+ updateFolderPaths(target.entry.path);
+ showDeleteFolderDialog.value = false;
+ await refreshMutationFolders();
+ toast(t("sqlFileTree.folderDeleted"), 1500);
+ } catch (e: any) {
+ // Recursive deletion can fail after removing some children. Inspect actual
+ // disk state, including tabs hidden by the file-name filter.
+ // Closed files can also have persisted targets, so the entire subtree is
+ // untrusted after a non-atomic delete attempt.
+ forgetExternalSqlFolderTargets(target.entry.path);
+ await Promise.all(
+ queryStore.tabs
+ .filter((tab) => tab.externalSqlPath && isWithinFolder(tab.externalSqlPath, target.entry.path))
+ .map(async (tab) => {
+ const path = tab.externalSqlPath!;
+ try {
+ if ((await api.inspectExternalSqlFile(path)).kind === "missing") {
+ queryStore.markExternalSqlFileMissingForPath(path);
+ forgetExternalSqlFileTarget(path);
+ }
+ } catch {
+ // Keep the editor intact when the path cannot be inspected.
+ }
+ }),
+ );
+ await refreshMutationFolders();
+ toast(t("sqlFileTree.deleteFolderFailed", { message: translateBackendError(t, e) }), 5000);
+ } finally {
+ folderMutationPending.value = false;
+ }
+}
+
async function deleteSqlFile() {
const target = deleteTarget.value;
if (!target) return;
@@ -510,6 +660,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {
const folder = folderIdx !== -1 ? folders.value[folderIdx] : undefined;
return [
{ label: t("sqlFileTree.newSqlFile"), action: () => openCreateDialog(target.folderPath, target.folderPath), icon: FilePlus },
+ { label: t("sqlFileTree.newFolder"), action: () => openCreateFolderDialog(target.folderPath, target.folderPath), icon: FolderPlus },
{ label: "", separator: true },
{ label: t("sqlFileTree.revealInFileManager"), action: () => revealInFileManager(target.folderPath), icon: FolderSearch },
{ label: t("sqlFileTree.copyPath"), action: () => copyPath(target.folderPath), icon: Copy },
@@ -526,12 +677,16 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {
if (target.kind === "dir") {
return [
{ label: t("sqlFileTree.newSqlFile"), action: () => openCreateDialog(target.folderPath, target.entry.path), icon: FilePlus },
+ { label: t("sqlFileTree.newFolder"), action: () => openCreateFolderDialog(target.folderPath, target.entry.path), icon: FolderPlus },
{ label: "", separator: true },
{ label: t("sqlFileTree.revealInFileManager"), action: () => revealInFileManager(target.entry.path), icon: FolderSearch },
{ label: t("sqlFileTree.copyPath"), action: () => copyPath(target.entry.path), icon: Copy },
{ label: "", separator: true },
{ label: t("sqlFileTree.expandAll"), action: () => expandSubtree(target), icon: ChevronsUpDown },
{ label: t("sqlFileTree.collapseAll"), action: () => collapseSubtree(target), icon: ChevronsDownUp },
+ { label: "", separator: true },
+ { label: t("sqlFileTree.renameFolder"), action: () => openRenameFolderDialog(target), icon: Pencil },
+ { label: t("sqlFileTree.deleteFolder"), action: () => openDeleteFolderDialog(target), icon: Trash2, variant: "destructive" },
];
}
@@ -672,6 +827,11 @@ function clearContextTarget() {
<FilePlus class="h-3 w-3" />
</Button>
</LightTooltip>
+ <LightTooltip :text="t('sqlFileTree.newFolder')" side="bottom" :delay="0" :close-delay="0" nowrap>
+ <Button variant="ghost" size="icon" class="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" @click.stop="openCreateFolderDialog(folder.path, folder.path)">
+ <FolderPlus class="h-3 w-3" />
+ </Button>
+ </LightTooltip>
<LightTooltip :text="t('sqlFileTree.revealInFileManager')" side="bottom" :delay="0" :close-delay="0" nowrap>
<Button variant="ghost" size="icon" class="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" @click.stop="revealInFileManager(folder.path)">
<FolderSearch class="h-3 w-3" />
@@ -727,6 +887,21 @@ function clearContextTarget() {
<FilePlus class="h-3 w-3" />
</Button>
</LightTooltip>
+ <LightTooltip :text="t('sqlFileTree.newFolder')" side="bottom" :delay="0" :close-delay="0" nowrap>
+ <Button variant="ghost" size="icon" class="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" @click.stop="openCreateFolderDialog(folder.path, entry.path)">
+ <FolderPlus class="h-3 w-3" />
+ </Button>
+ </LightTooltip>
+ <LightTooltip :text="t('sqlFileTree.renameFolder')" side="bottom" :delay="0" :close-delay="0" nowrap>
+ <Button variant="ghost" size="icon" class="h-4 w-4 shrink-0 text-muted-foreground hover:text-foreground" @click.stop="openRenameFolderDialog({ kind: 'dir', folderPath: folder.path, entry })">
+ <Pencil class="h-3 w-3" />
+ </Button>
+ </LightTooltip>
+ <LightTooltip :text="t('sqlFileTree.deleteFolder')" side="bottom" :delay="0" :close-delay="0" nowrap>
+ <Button variant="ghost" size="icon" class="h-4 w-4 shrink-0 text-muted-foreground hover:text-destructive" @click.stop="openDeleteFolderDialog({ kind: 'dir', folderPath: folder.path, entry })">
+ <Trash2 class="h-3 w-3" />
+ </Button>
+ </LightTooltip>
</template>
<template v-else>
<LightTooltip :text="t('sqlFileTree.renameFile')" side="bottom" :delay="0" :close-delay="0" nowrap>
@@ -780,6 +955,27 @@ function clearContextTarget() {
</DialogContent>
</Dialog>
+ <Dialog
+ :open="showCreateFolderDialog"
+ @update:open="
+ (open) => {
+ if (!folderMutationPending) showCreateFolderDialog = open;
+ }
+ "
+ >
+ <DialogContent class="sm:max-w-[380px]">
+ <DialogHeader>
+ <DialogTitle>{{ t("sqlFileTree.newFolder") }}</DialogTitle>
+ <DialogDescription>{{ t("sqlFileTree.newFolderDescription") }}</DialogDescription>
+ </DialogHeader>
+ <Input :disabled="folderMutationPending" v-model="fileNameInput" autofocus @keydown.enter.prevent="createSqlFolder" />
+ <DialogFooter>
+ <Button :disabled="folderMutationPending" variant="outline" size="sm" @click="showCreateFolderDialog = false">{{ t("dangerDialog.cancel") }}</Button>
+ <Button size="sm" :disabled="folderMutationPending || !fileNameInput.trim()" @click="createSqlFolder">{{ t("sqlFileTree.createFolder") }}</Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+
<Dialog :open="showRenameDialog" @update:open="(open) => (showRenameDialog = open)">
<DialogContent class="sm:max-w-[380px]">
<DialogHeader>
@@ -794,6 +990,27 @@ function clearContextTarget() {
</DialogContent>
</Dialog>
+ <Dialog
+ :open="showRenameFolderDialog"
+ @update:open="
+ (open) => {
+ if (!folderMutationPending) showRenameFolderDialog = open;
+ }
+ "
+ >
+ <DialogContent class="sm:max-w-[380px]">
+ <DialogHeader>
+ <DialogTitle>{{ t("sqlFileTree.renameFolder") }}</DialogTitle>
+ <DialogDescription>{{ t("sqlFileTree.renameFolderDescription") }}</DialogDescription>
+ </DialogHeader>
+ <Input :disabled="folderMutationPending" v-model="fileNameInput" autofocus @keydown.enter.prevent="renameSqlFolder" />
+ <DialogFooter>
+ <Button :disabled="folderMutationPending" variant="outline" size="sm" @click="showRenameFolderDialog = false">{{ t("dangerDialog.cancel") }}</Button>
+ <Button size="sm" :disabled="folderMutationPending || !fileNameInput.trim()" @click="renameSqlFolder">{{ t("sqlFileTree.renameFolder") }}</Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+
<Dialog :open="showDeleteDialog" @update:open="(open) => (showDeleteDialog = open)">
<DialogContent class="sm:max-w-[380px]">
<DialogHeader>
@@ -806,5 +1023,25 @@ function clearContextTarget() {
</DialogFooter>
</DialogContent>
</Dialog>
+
+ <Dialog
+ :open="showDeleteFolderDialog"
+ @update:open="
+ (open) => {
+ if (!folderMutationPending) showDeleteFolderDialog = open;
+ }
+ "
+ >
+ <DialogContent class="sm:max-w-[380px]">
+ <DialogHeader>
+ <DialogTitle>{{ t("sqlFileTree.deleteFolder") }}</DialogTitle>
+ <DialogDescription>{{ t("sqlFileTree.deleteFolderConfirm", { name: deleteFolderTarget?.entry.name || "" }) }}</DialogDescription>
+ </DialogHeader>
+ <DialogFooter>
+ <Button :disabled="folderMutationPending" variant="outline" size="sm" @click="showDeleteFolderDialog = false">{{ t("dangerDialog.cancel") }}</Button>
+ <Button :disabled="folderMutationPending" variant="destructive" size="sm" @click="deleteSqlFolder">{{ t("dangerDialog.deleteConfirm") }}</Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
</div>
</template>
diff --git a/apps/desktop/src/components/layout/__tests__/SqlFilePanel.folderMutations.spec.ts b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.folderMutations.spec.ts
new file mode 100644
index 0000000000..362cf02b0a
--- /dev/null
+++ b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.folderMutations.spec.ts
@@ -0,0 +1,75 @@
+// @vitest-environment happy-dom
+
+import { createApp, type App } from "vue";
+import { createPinia, setActivePinia } from "pinia";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import i18n from "@/i18n";
+
+const mocks = vi.hoisted(() => ({
+ deleteSqlFolderInFolder: vi.fn(),
+ forgetExternalSqlFolderTargets: vi.fn(),
+}));
+
+vi.mock("@/lib/sqlFile/sqlFileFolders", () => ({
+ getSqlFileFilter: () => "*.sql",
+ getSqlFileFolderPaths: () => ["/sql"],
+ saveSqlFileFilter: vi.fn(),
+ saveSqlFileFolderPaths: vi.fn(),
+ notifySqlFileFoldersChanged: vi.fn(),
+}));
+vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
+vi.mock("@/lib/backend/api", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/lib/backend/api")>()),
+ listSqlFilesInFolder: vi.fn(async () => [{ name: "archive", path: "/sql/archive", is_dir: true, children: [] }]),
+ deleteSqlFolderInFolder: mocks.deleteSqlFolderInFolder,
+}));
+vi.mock("@/lib/sql/externalSqlFileTarget", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/lib/sql/externalSqlFileTarget")>()),
+ forgetExternalSqlFolderTargets: mocks.forgetExternalSqlFolderTargets,
+}));
+
+import SqlFilePanel from "../SqlFilePanel.vue";
+
+const mounted: Array<{ app: App; host: HTMLElement }> = [];
+
+beforeEach(() => {
+ mocks.deleteSqlFolderInFolder.mockReset().mockRejectedValue(new Error("partial deletion"));
+ mocks.forgetExternalSqlFolderTargets.mockReset();
+});
+
+afterEach(() => {
+ for (const { app, host } of mounted.splice(0)) {
+ app.unmount();
+ host.remove();
+ }
+ vi.restoreAllMocks();
+});
+
+describe("SQL file panel folder mutations", () => {
+ it("clears persisted subtree targets when recursive deletion partially fails without open tabs", async () => {
+ const pinia = createPinia();
+ setActivePinia(pinia);
+ const host = document.createElement("div");
+ document.body.appendChild(host);
+ const app = createApp(SqlFilePanel);
+ app.use(pinia);
+ app.use(i18n);
+ app.mount(host);
+ mounted.push({ app, host });
+ await vi.waitFor(() => expect(host.textContent).toContain("archive"));
+
+ const folderRow = host.querySelector<HTMLElement>('[data-sql-file-path="/sql/archive"]')!;
+ const rowButtons = folderRow.querySelectorAll<HTMLButtonElement>("button");
+ rowButtons[rowButtons.length - 1].click();
+ const dialog = await vi.waitFor(() => {
+ const content = document.querySelector<HTMLElement>('[data-slot="dialog-content"]');
+ expect(content).not.toBeNull();
+ return content!;
+ });
+ const deleteButton = Array.from(dialog.querySelectorAll<HTMLButtonElement>("button")).find((button) => button.textContent?.includes(i18n.global.t("dangerDialog.deleteConfirm")))!;
+ deleteButton.click();
+
+ await vi.waitFor(() => expect(mocks.deleteSqlFolderInFolder).toHaveBeenCalledWith("/sql", "/sql/archive"));
+ expect(mocks.forgetExternalSqlFolderTargets).toHaveBeenCalledWith("/sql/archive");
+ });
+});
diff --git a/apps/desktop/src/i18n/backend-errors.ts b/apps/desktop/src/i18n/backend-errors.ts
index 8ba485d27f..374d3913ba 100644
--- a/apps/desktop/src/i18n/backend-errors.ts
+++ b/apps/desktop/src/i18n/backend-errors.ts
@@ -82,6 +82,13 @@ const taggedAiCliErrorKeys: Record<string, string> = {
};
const exactMessageKeys: Record<string, string> = {
+ "Folder name must not contain a path": "sqlFileTree.folderNameInvalid",
+ "This folder name is excluded from the SQL file browser": "sqlFileTree.folderNameExcluded",
+ "The maximum SQL folder depth has been reached": "sqlFileTree.folderDepthExceeded",
+ "A file or folder with this name already exists": "sqlFileTree.folderNameExists",
+ "Only directories can be managed here": "sqlFileTree.directoryRequired",
+ "The opened root folder cannot be renamed or deleted": "sqlFileTree.rootFolderProtected",
+ "SQL folder is outside the opened root folder": "sqlFileTree.folderOutsideRoot",
"Plugin update is in progress. Please try again after it finishes.": "pluginPlatform.updateInProgress",
"Plugin update blocked by active operations. Please wait for them to finish.": "pluginPlatform.updateBlockedByOperations",
[PHOENIX_DRIVER_NOT_INSTALLED_ERROR]: "connection.phoenixDriverNotInstalled",
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index a3e105f336..055cbb612d 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -6691,6 +6691,26 @@ export default withEnglishFallback({
totalFiles: "{count} fayl",
},
sqlFileTree: {
+ folderNameInvalid: "Yol deyil, tək qovluq adı daxil edin.",
+ folderNameExcluded: "Bu qovluq adı SQL fayl brauzerindən istisna edilib.",
+ folderDepthExceeded: "Maksimum qovluq dərinliyinə çatılıb.",
+ folderNameExists: "Bu adda fayl və ya qovluq artıq mövcuddur.",
+ directoryRequired: "Fayl və ya simvolik keçid deyil, adi qovluq seçin.",
+ rootFolderProtected: "Açıq kök qovluğun adını dəyişmək və ya onu silmək olmaz.",
+ folderOutsideRoot: "Qovluq açıq kök qovluqdan kənardadır.",
+ newFolder: "Yeni qovluq",
+ newFolderDescription: "Diskdə yaratmaq üçün bir qovluq adı daxil edin.",
+ createFolder: "Yarat",
+ folderCreated: "Qovluq yaradıldı",
+ createFolderFailed: "Qovluq yaradıla bilmədi: {message}",
+ renameFolder: "Qovluğun adını dəyiş",
+ renameFolderDescription: "Diskdəki qovluğun adını dəyişir və açıq faylların yollarını yeniləyir.",
+ folderRenamed: "Qovluğun adı dəyişdirildi",
+ renameFolderFailed: "Qovluğun adı dəyişdirilə bilmədi: {message}",
+ deleteFolder: "Qovluğu sil",
+ deleteFolderConfirm: "{name} və filtrin gizlətdiyi fayllar daxil olmaqla bütün məzmun silinsin? Bu əməliyyat geri qaytarıla bilməz.",
+ folderDeleted: "Qovluq silindi",
+ deleteFolderFailed: "Qovluq silinə bilmədi: {message}",
title: "SQL faylları",
storageHelp: "Bunlar Qovluq aç ilə açılan diskdəki real .sql fayllarıdır; düzəlişlər birbaşa orijinal fayla yazılır.",
openFolder: "Qovluq aç",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 15da0201d4..62d1a6d55e 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -7671,6 +7671,26 @@ export default {
totalFiles: "{count} files",
},
sqlFileTree: {
+ folderNameInvalid: "Enter a single folder name, not a path.",
+ folderNameExcluded: "This folder name is excluded from the SQL file browser.",
+ folderDepthExceeded: "The maximum folder depth has been reached.",
+ folderNameExists: "A file or folder with this name already exists.",
+ directoryRequired: "Select a regular directory, not a file or symbolic link.",
+ rootFolderProtected: "The opened root folder cannot be renamed or deleted.",
+ folderOutsideRoot: "The folder is outside the opened root folder.",
+ newFolder: "New folder",
+ newFolderDescription: "Create a folder on disk. Enter a single folder name.",
+ createFolder: "Create",
+ folderCreated: "Folder created",
+ createFolderFailed: "Failed to create folder: {message}",
+ renameFolder: "Rename folder",
+ renameFolderDescription: "Rename this folder on disk. Open file paths will be updated.",
+ folderRenamed: "Folder renamed",
+ renameFolderFailed: "Failed to rename folder: {message}",
+ deleteFolder: "Delete folder",
+ deleteFolderConfirm: "Delete {name} and all its contents, including files hidden by the filter? This cannot be undone.",
+ folderDeleted: "Folder deleted",
+ deleteFolderFailed: "Failed to delete folder: {message}",
title: "SQL Files",
storageHelp: "These are the real .sql files on disk opened via Open Folder; edits are saved straight back to the original file.",
openFolder: "Open Folder",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index bcf6889005..52e8d38bb3 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -9821,6 +9821,26 @@ export default withEnglishFallback({
actionSuccess: '{action} completado para "{name}".',
},
sqlFileTree: {
+ folderNameInvalid: "Introduzca un solo nombre de carpeta, no una ruta.",
+ folderNameExcluded: "Este nombre de carpeta está excluido del explorador de archivos SQL.",
+ folderDepthExceeded: "Se alcanzó la profundidad máxima de carpetas.",
+ folderNameExists: "Ya existe un archivo o carpeta con este nombre.",
+ directoryRequired: "Seleccione un directorio normal, no un archivo ni un enlace simbólico.",
+ rootFolderProtected: "No se puede renombrar ni eliminar la carpeta raíz abierta.",
+ folderOutsideRoot: "La carpeta está fuera de la carpeta raíz abierta.",
+ newFolder: "Nueva carpeta",
+ newFolderDescription: "Introduzca un nombre para crear una carpeta en el disco.",
+ createFolder: "Crear",
+ folderCreated: "Carpeta creada",
+ createFolderFailed: "No se pudo crear la carpeta: {message}",
+ renameFolder: "Renombrar carpeta",
+ renameFolderDescription: "Renombra la carpeta en el disco y actualiza las rutas de los archivos abiertos.",
+ folderRenamed: "Carpeta renombrada",
+ renameFolderFailed: "No se pudo renombrar la carpeta: {message}",
+ deleteFolder: "Eliminar carpeta",
+ deleteFolderConfirm: "¿Eliminar {name} y todo su contenido, incluidos los archivos ocultos por el filtro? Esta acción no se puede deshacer.",
+ folderDeleted: "Carpeta eliminada",
+ deleteFolderFailed: "No se pudo eliminar la carpeta: {message}",
title: "Archivos SQL",
storageHelp: "Son los archivos .sql reales del disco abiertos con Abrir carpeta; las ediciones se guardan directamente en el archivo original.",
openFolder: "Abrir carpeta",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 9d5f12d341..6ec0b5fece 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -7393,6 +7393,26 @@ export default withEnglishFallback({
totalFiles: "{count} file",
},
sqlFileTree: {
+ folderNameInvalid: "Masukkan satu nama folder, bukan jalur.",
+ folderNameExcluded: "Nama folder ini dikecualikan dari penjelajah file SQL.",
+ folderDepthExceeded: "Kedalaman folder maksimum telah tercapai.",
+ folderNameExists: "File atau folder dengan nama ini sudah ada.",
+ directoryRequired: "Pilih direktori biasa, bukan file atau tautan simbolik.",
+ rootFolderProtected: "Folder akar yang terbuka tidak dapat diubah namanya atau dihapus.",
+ folderOutsideRoot: "Folder berada di luar folder akar yang terbuka.",
+ newFolder: "Folder baru",
+ newFolderDescription: "Masukkan satu nama folder untuk dibuat di disk.",
+ createFolder: "Buat",
+ folderCreated: "Folder dibuat",
+ createFolderFailed: "Gagal membuat folder: {message}",
+ renameFolder: "Ubah nama folder",
+ renameFolderDescription: "Mengubah nama folder di disk dan memperbarui jalur file yang terbuka.",
+ folderRenamed: "Nama folder diubah",
+ renameFolderFailed: "Gagal mengubah nama folder: {message}",
+ deleteFolder: "Hapus folder",
+ deleteFolderConfirm: "Hapus {name} dan semua isinya, termasuk file yang disembunyikan oleh filter? Tindakan ini tidak dapat dibatalkan.",
+ folderDeleted: "Folder dihapus",
+ deleteFolderFailed: "Gagal menghapus folder: {message}",
title: "File SQL",
storageHelp: "Ini adalah file .sql asli di disk yang dibuka melalui Buka Folder; perubahan disimpan langsung kembali ke file aslinya.",
openFolder: "Buka Folder",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index bba219a63b..1285fb721c 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -9567,6 +9567,26 @@ export default withEnglishFallback({
actionSuccess: '{action} completato per "{name}".',
},
sqlFileTree: {
+ folderNameInvalid: "Inserisci un solo nome di cartella, non un percorso.",
+ folderNameExcluded: "Questo nome di cartella è escluso dal browser di file SQL.",
+ folderDepthExceeded: "È stata raggiunta la profondità massima delle cartelle.",
+ folderNameExists: "Esiste già un file o una cartella con questo nome.",
+ directoryRequired: "Seleziona una directory normale, non un file o un collegamento simbolico.",
+ rootFolderProtected: "La cartella radice aperta non può essere rinominata o eliminata.",
+ folderOutsideRoot: "La cartella si trova fuori dalla cartella radice aperta.",
+ newFolder: "Nuova cartella",
+ newFolderDescription: "Inserisci un nome per creare una cartella sul disco.",
+ createFolder: "Crea",
+ folderCreated: "Cartella creata",
+ createFolderFailed: "Creazione della cartella non riuscita: {message}",
+ renameFolder: "Rinomina cartella",
+ renameFolderDescription: "Rinomina la cartella sul disco e aggiorna i percorsi dei file aperti.",
+ folderRenamed: "Cartella rinominata",
+ renameFolderFailed: "Rinomina della cartella non riuscita: {message}",
+ deleteFolder: "Elimina cartella",
+ deleteFolderConfirm: "Eliminare {name} e tutto il contenuto, inclusi i file nascosti dal filtro? Questa azione è irreversibile.",
+ folderDeleted: "Cartella eliminata",
+ deleteFolderFailed: "Eliminazione della cartella non riuscita: {message}",
title: "File SQL",
storageHelp: "Sono i file .sql reali sul disco aperti con Apri cartella; le modifiche vengono salvate direttamente nel file originale.",
openFolder: "Apri cartella",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index e8c637d4fb..010d45a028 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -9605,6 +9605,26 @@ export default withEnglishFallback({
actionSuccess: "「{name}」の{action}が完了しました。",
},
sqlFileTree: {
+ folderNameInvalid: "パスではなく単一のフォルダー名を入力してください。",
+ folderNameExcluded: "このフォルダー名は SQL ファイルパネルの表示対象外です。",
+ folderDepthExceeded: "フォルダーの最大階層に達しました。",
+ folderNameExists: "同じ名前のファイルまたはフォルダーが存在します。",
+ directoryRequired: "ファイルやシンボリックリンクではなく通常のディレクトリを選択してください。",
+ rootFolderProtected: "開いているルートフォルダーは名前変更や削除ができません。",
+ folderOutsideRoot: "開いているルートフォルダーの外にあるフォルダーです。",
+ newFolder: "新しいフォルダー",
+ newFolderDescription: "ディスク上に作成するフォルダー名を入力してください。",
+ createFolder: "作成",
+ folderCreated: "フォルダーを作成しました",
+ createFolderFailed: "フォルダーの作成に失敗しました: {message}",
+ renameFolder: "フォルダー名の変更",
+ renameFolderDescription: "ディスク上のフォルダー名を変更します。開いているファイルのパスも更新されます。",
+ folderRenamed: "フォルダー名を変更しました",
+ renameFolderFailed: "フォルダー名の変更に失敗しました: {message}",
+ deleteFolder: "フォルダーの削除",
+ deleteFolderConfirm: "{name} とその内容をすべて削除しますか?フィルターで非表示のファイルも含まれます。この操作は取り消せません。",
+ folderDeleted: "フォルダーを削除しました",
+ deleteFolderFailed: "フォルダーの削除に失敗しました: {message}",
title: "SQL ファイル",
storageHelp: "「フォルダーを開く」で開いたディスク上の実際の.sqlファイルを表示し、編集内容は元のファイルに直接保存されます。",
openFolder: "フォルダーを開く",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 5a94563213..b9ffeb1f9b 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -6618,6 +6618,26 @@ export default withEnglishFallback({
totalFiles: "{count}개 파일",
},
sqlFileTree: {
+ folderNameInvalid: "경로가 아닌 폴더 이름 하나를 입력하세요.",
+ folderNameExcluded: "이 폴더 이름은 SQL 파일 패널에서 제외됩니다.",
+ folderDepthExceeded: "최대 폴더 깊이에 도달했습니다.",
+ folderNameExists: "같은 이름의 파일 또는 폴더가 이미 있습니다.",
+ directoryRequired: "파일이나 심볼릭 링크가 아닌 일반 디렉터리를 선택하세요.",
+ rootFolderProtected: "열린 루트 폴더는 이름을 변경하거나 삭제할 수 없습니다.",
+ folderOutsideRoot: "열린 루트 폴더 밖에 있는 폴더입니다.",
+ newFolder: "새 폴더",
+ newFolderDescription: "디스크에 만들 폴더 이름 하나를 입력하세요.",
+ createFolder: "만들기",
+ folderCreated: "폴더를 만들었습니다",
+ createFolderFailed: "폴더 만들기 실패: {message}",
+ renameFolder: "폴더 이름 변경",
+ renameFolderDescription: "디스크의 폴더 이름을 변경합니다. 열린 파일 경로도 업데이트됩니다.",
+ folderRenamed: "폴더 이름을 변경했습니다",
+ renameFolderFailed: "폴더 이름 변경 실패: {message}",
+ deleteFolder: "폴더 삭제",
+ deleteFolderConfirm: "{name} 및 모든 내용을 삭제할까요? 필터로 숨겨진 파일도 포함됩니다. 이 작업은 되돌릴 수 없습니다.",
+ folderDeleted: "폴더를 삭제했습니다",
+ deleteFolderFailed: "폴더 삭제 실패: {message}",
title: "SQL 파일",
storageHelp: "폴더 열기로 연 디스크의 실제 .sql 파일을 표시하며, 편집 내용은 원본 파일에 바로 저장됩니다.",
openFolder: "폴더 열기",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 9869998e7d..78145a3bd6 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -9564,6 +9564,26 @@ export default withEnglishFallback({
actionSuccess: '{action} concluído para "{name}".',
},
sqlFileTree: {
+ folderNameInvalid: "Digite um único nome de pasta, não um caminho.",
+ folderNameExcluded: "Este nome de pasta é excluído do navegador de arquivos SQL.",
+ folderDepthExceeded: "A profundidade máxima de pastas foi atingida.",
+ folderNameExists: "Já existe um arquivo ou pasta com este nome.",
+ directoryRequired: "Selecione um diretório normal, não um arquivo ou link simbólico.",
+ rootFolderProtected: "A pasta raiz aberta não pode ser renomeada ou excluída.",
+ folderOutsideRoot: "A pasta está fora da pasta raiz aberta.",
+ newFolder: "Nova pasta",
+ newFolderDescription: "Digite um nome para criar uma pasta no disco.",
+ createFolder: "Criar",
+ folderCreated: "Pasta criada",
+ createFolderFailed: "Falha ao criar pasta: {message}",
+ renameFolder: "Renomear pasta",
+ renameFolderDescription: "Renomeia a pasta no disco e atualiza os caminhos dos arquivos abertos.",
+ folderRenamed: "Pasta renomeada",
+ renameFolderFailed: "Falha ao renomear pasta: {message}",
+ deleteFolder: "Excluir pasta",
+ deleteFolderConfirm: "Excluir {name} e todo o conteúdo, incluindo arquivos ocultos pelo filtro? Esta ação não pode ser desfeita.",
+ folderDeleted: "Pasta excluída",
+ deleteFolderFailed: "Falha ao excluir pasta: {message}",
title: "Arquivos SQL",
storageHelp: "São os arquivos .sql reais no disco abertos com Abrir pasta; as edições são salvas diretamente no arquivo original.",
openFolder: "Abrir pasta",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 0774f108ca..1abf86910a 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -8018,6 +8018,26 @@ export default withEnglishFallback({
totalFiles: "{count} файлов",
},
sqlFileTree: {
+ folderNameInvalid: "Введите одно имя папки, а не путь.",
+ folderNameExcluded: "Это имя папки исключено из обозревателя SQL-файлов.",
+ folderDepthExceeded: "Достигнута максимальная глубина папок.",
+ folderNameExists: "Файл или папка с таким именем уже существует.",
+ directoryRequired: "Выберите обычный каталог, а не файл или символическую ссылку.",
+ rootFolderProtected: "Открытую корневую папку нельзя переименовать или удалить.",
+ folderOutsideRoot: "Папка находится за пределами открытой корневой папки.",
+ newFolder: "Новая папка",
+ newFolderDescription: "Введите имя папки для создания на диске.",
+ createFolder: "Создать",
+ folderCreated: "Папка создана",
+ createFolderFailed: "Не удалось создать папку: {message}",
+ renameFolder: "Переименовать папку",
+ renameFolderDescription: "Переименовать папку на диске и обновить пути открытых файлов.",
+ folderRenamed: "Папка переименована",
+ renameFolderFailed: "Не удалось переименовать папку: {message}",
+ deleteFolder: "Удалить папку",
+ deleteFolderConfirm: "Удалить {name} и всё содержимое, включая скрытые фильтром файлы? Это действие нельзя отменить.",
+ folderDeleted: "Папка удалена",
+ deleteFolderFailed: "Не удалось удалить папку: {message}",
title: "SQL-файлы",
storageHelp: "Это реальные .sql-файлы на диске, открытые через «Открыть папку»; изменения сохраняются прямо в исходный файл.",
openFolder: "Открыть папку",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index 3609ae5f34..306c697ab8 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -6572,6 +6572,26 @@ export default withEnglishFallback({
totalFiles: "{count} dosya",
},
sqlFileTree: {
+ folderNameInvalid: "Yol yerine tek bir klasör adı girin.",
+ folderNameExcluded: "Bu klasör adı SQL dosya tarayıcısından hariç tutulur.",
+ folderDepthExceeded: "Maksimum klasör derinliğine ulaşıldı.",
+ folderNameExists: "Bu ada sahip bir dosya veya klasör zaten var.",
+ directoryRequired: "Dosya veya sembolik bağlantı yerine normal bir dizin seçin.",
+ rootFolderProtected: "Açık kök klasör yeniden adlandırılamaz veya silinemez.",
+ folderOutsideRoot: "Klasör, açık kök klasörün dışındadır.",
+ newFolder: "Yeni klasör",
+ newFolderDescription: "Diskte oluşturmak için tek bir klasör adı girin.",
+ createFolder: "Oluştur",
+ folderCreated: "Klasör oluşturuldu",
+ createFolderFailed: "Klasör oluşturulamadı: {message}",
+ renameFolder: "Klasörü yeniden adlandır",
+ renameFolderDescription: "Diskteki klasörü yeniden adlandırır ve açık dosya yollarını günceller.",
+ folderRenamed: "Klasör yeniden adlandırıldı",
+ renameFolderFailed: "Klasör yeniden adlandırılamadı: {message}",
+ deleteFolder: "Klasörü sil",
+ deleteFolderConfirm: "{name} ve filtreyle gizlenen dosyalar dahil tüm içeriği silinsin mi? Bu işlem geri alınamaz.",
+ folderDeleted: "Klasör silindi",
+ deleteFolderFailed: "Klasör silinemedi: {message}",
title: "SQL Dosyaları",
storageHelp: "Klasör Aç ile açılan diskteki gerçek .sql dosyalarıdır; düzenlemeler doğrudan özgün dosyaya kaydedilir.",
openFolder: "Klasör Aç",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index aa0cefb118..edf106b6f0 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -7654,6 +7654,26 @@ export default withEnglishFallback({
totalFiles: "{count} 个文件",
},
sqlFileTree: {
+ folderNameInvalid: "请输入单个文件夹名称,不能包含路径。",
+ folderNameExcluded: "此文件夹名称被 SQL 文件面板排除。",
+ folderDepthExceeded: "已达到文件夹最大层级。",
+ folderNameExists: "已存在同名文件或文件夹。",
+ directoryRequired: "请选择普通目录,不能选择文件或符号链接。",
+ rootFolderProtected: "不能重命名或删除已打开的根文件夹。",
+ folderOutsideRoot: "此文件夹位于已打开的根文件夹之外。",
+ newFolder: "新建文件夹",
+ newFolderDescription: "在磁盘上新建文件夹,请输入单个文件夹名称。",
+ createFolder: "新建",
+ folderCreated: "文件夹已新建",
+ createFolderFailed: "新建文件夹失败:{message}",
+ renameFolder: "重命名文件夹",
+ renameFolderDescription: "重命名磁盘上的文件夹,已打开文件的路径将同步更新。",
+ folderRenamed: "文件夹已重命名",
+ renameFolderFailed: "重命名文件夹失败:{message}",
+ deleteFolder: "删除文件夹",
+ deleteFolderConfirm: "确定删除 {name} 及其全部内容吗?包含被过滤规则隐藏的文件,此操作无法撤销。",
+ folderDeleted: "文件夹已删除",
+ deleteFolderFailed: "删除文件夹失败:{message}",
title: "SQL 文件",
storageHelp: "此处列出通过「打开文件夹」打开的磁盘上真实 .sql 文件,编辑后直接保存回原文件。",
openFolder: "打开文件夹",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index a67b9ddb25..4e4be0396a 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -9579,6 +9579,26 @@ export default withEnglishFallback({
actionSuccess: "已完成對「{name}」的{action}。",
},
sqlFileTree: {
+ folderNameInvalid: "請輸入單一資料夾名稱,不能包含路徑。",
+ folderNameExcluded: "此資料夾名稱被 SQL 檔案面板排除。",
+ folderDepthExceeded: "已達到資料夾最大層級。",
+ folderNameExists: "已存在同名檔案或資料夾。",
+ directoryRequired: "請選擇一般目錄,不能選擇檔案或符號連結。",
+ rootFolderProtected: "不能重新命名或刪除已開啟的根資料夾。",
+ folderOutsideRoot: "此資料夾位於已開啟的根資料夾之外。",
+ newFolder: "新增資料夾",
+ newFolderDescription: "在磁碟上新增資料夾,請輸入單一資料夾名稱。",
+ createFolder: "新增",
+ folderCreated: "資料夾已新增",
+ createFolderFailed: "新增資料夾失敗:{message}",
+ renameFolder: "重新命名資料夾",
+ renameFolderDescription: "重新命名磁碟上的資料夾,已開啟檔案的路徑將同步更新。",
+ folderRenamed: "資料夾已重新命名",
+ renameFolderFailed: "重新命名資料夾失敗:{message}",
+ deleteFolder: "刪除資料夾",
+ deleteFolderConfirm: "確定刪除 {name} 及其全部內容嗎?包含被篩選規則隱藏的檔案,此操作無法復原。",
+ folderDeleted: "資料夾已刪除",
+ deleteFolderFailed: "刪除資料夾失敗:{message}",
title: "SQL 檔案",
storageHelp: "此處列出透過「開啟資料夾」開啟的磁碟上真實 .sql 檔案,編輯後直接儲存回原檔案。",
openFolder: "開啟資料夾",
diff --git a/apps/desktop/src/lib/__tests__/sql/externalSqlFileTarget.spec.ts b/apps/desktop/src/lib/__tests__/sql/externalSqlFileTarget.spec.ts
index fc84b214cb..e3256870ba 100644
--- a/apps/desktop/src/lib/__tests__/sql/externalSqlFileTarget.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/externalSqlFileTarget.spec.ts
@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it } from "vitest";
import {
activeTabExternalSqlFileTarget,
EXTERNAL_SQL_FILE_TARGETS_STORAGE_KEY,
+ forgetExternalSqlFolderTargets,
MAX_EXTERNAL_SQL_FILE_TARGETS,
forgetExternalSqlFileTarget,
moveExternalSqlFileTarget,
@@ -157,6 +158,18 @@ describe("external SQL file targets", () => {
expect(resolveExternalSqlFileTarget("C:/work/report.sql", () => true, unassociatedExternalSqlFileTarget())).toEqual(unassociatedExternalSqlFileTarget());
});
+ it("removes persisted targets for every file in a deleted folder subtree", () => {
+ rememberExternalSqlFileTarget("/work/archive/open.sql", { connectionId: "open-connection", database: "sales" });
+ rememberExternalSqlFileTarget("/work/archive/closed.sql", { connectionId: "closed-connection", database: "analytics" });
+ rememberExternalSqlFileTarget("/work/keep.sql", { connectionId: "keep-connection", database: "default" });
+
+ forgetExternalSqlFolderTargets("/work/archive");
+
+ expect(resolveExternalSqlFileTarget("/work/archive/open.sql", () => true, unassociatedExternalSqlFileTarget())).toEqual(unassociatedExternalSqlFileTarget());
+ expect(resolveExternalSqlFileTarget("/work/archive/closed.sql", () => true, unassociatedExternalSqlFileTarget())).toEqual(unassociatedExternalSqlFileTarget());
+ expect(resolveExternalSqlFileTarget("/work/keep.sql", () => true, unassociatedExternalSqlFileTarget())).toMatchObject({ connectionId: "keep-connection" });
+ });
+
it("ignores malformed persisted state", () => {
localStorage.setItem(EXTERNAL_SQL_FILE_TARGETS_STORAGE_KEY, "not-json");
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlFileOpen.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlFileOpen.spec.ts
index c68b50f2dc..59fe0c4976 100644
--- a/apps/desktop/src/lib/__tests__/sql/sqlFileOpen.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/sqlFileOpen.spec.ts
@@ -19,6 +19,7 @@ import {
queryEditorOpenFileAccept,
queryEditorOpenFileFilters,
readBrowserSqlFile,
+ relocateExternalSqlPathWithinFolder,
} from "@/lib/sql/sqlFileOpen";
describe("external SQL file paths", () => {
@@ -26,6 +27,10 @@ describe("external SQL file paths", () => {
expect(normalizeExternalSqlPath(" C:\\work\\demo.sql ")).toBe("C:/work/demo.sql");
});
+ it("preserves the backend UNC prefix when relocating a folder path", () => {
+ expect(relocateExternalSqlPathWithinFolder("\\\\server\\share\\old\\nested\\query.sql", "\\\\server\\share\\old", "\\\\server\\share\\renamed")).toBe("\\\\server\\share\\renamed/nested/query.sql");
+ });
+
it("distinguishes SQL files from other filtered text files", () => {
expect(isSqlFilePath("C:\\work\\demo.SQL")).toBe(true);
expect(isSqlFilePath("/work/script.py")).toBe(false);
diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.ts
index 8ff9ccd016..3efe35a85b 100644
--- a/apps/desktop/src/lib/backend/api.ts
+++ b/apps/desktop/src/lib/backend/api.ts
@@ -499,6 +499,9 @@ export const saveGlobalSearchSettings = forward("saveGlobalSearchSettings");
export const createSqlFileInFolder = forward("createSqlFileInFolder");
export const renameSqlFileInFolder = forward("renameSqlFileInFolder");
export const deleteSqlFileInFolder = forward("deleteSqlFileInFolder");
+export const createSqlFolderInFolder = forward("createSqlFolderInFolder");
+export const renameSqlFolderInFolder = forward("renameSqlFolderInFolder");
+export const deleteSqlFolderInFolder = forward("deleteSqlFolderInFolder");
// Nacos
export const nacosTestConnection = forward("nacosTestConnection");
diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.ts
index 4902a1fc6c..2d08fe5316 100644
--- a/apps/desktop/src/lib/backend/http.ts
+++ b/apps/desktop/src/lib/backend/http.ts
@@ -2942,7 +2942,7 @@ export interface SqlFileEntry {
children: SqlFileEntry[];
}
-export async function listSqlFilesInFolder(_folderPath: string, _fileFilter?: string): Promise<SqlFileEntry[]> {
+export async function listSqlFilesInFolder(_folderPath: string, _fileFilter?: string, _includeEmptyDirectories?: boolean): Promise<SqlFileEntry[]> {
throw new Error("Listing SQL files in a folder is only available in the desktop app");
}
@@ -2958,6 +2958,18 @@ export async function deleteSqlFileInFolder(_rootPath: string, _filePath: string
throw new Error("Managing SQL files in folders is only available in the desktop app");
}
+export async function createSqlFolderInFolder(_rootPath: string, _directoryPath: string, _folderName: string): Promise<string> {
+ throw new Error("Managing SQL folders is only available in the desktop app");
+}
+
+export async function renameSqlFolderInFolder(_rootPath: string, _folderPath: string, _folderName: string): Promise<string> {
+ throw new Error("Managing SQL folders is only available in the desktop app");
+}
+
+export async function deleteSqlFolderInFolder(_rootPath: string, _folderPath: string): Promise<void> {
+ throw new Error("Managing SQL folders is only available in the desktop app");
+}
+
export interface GlobalSearchRequest {
roots: string[];
query: string;
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index 61ccfc1e94..b89386e4e4 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -1314,8 +1314,8 @@ export interface SqlFileEntry {
children: SqlFileEntry[];
}
-export async function listSqlFilesInFolder(folderPath: string, fileFilter?: string): Promise<SqlFileEntry[]> {
- return invoke("list_sql_files_in_folder", { folderPath, fileFilter });
+export async function listSqlFilesInFolder(folderPath: string, fileFilter?: string, includeEmptyDirectories?: boolean): Promise<SqlFileEntry[]> {
+ return invoke("list_sql_files_in_folder", { folderPath, fileFilter, includeEmptyDirectories });
}
export async function createSqlFileInFolder(rootPath: string, directoryPath: string, fileName: string): Promise<string> {
@@ -1330,6 +1330,18 @@ export async function deleteSqlFileInFolder(rootPath: string, filePath: string):
return invoke("delete_sql_file_in_folder", { rootPath, filePath });
}
+export async function createSqlFolderInFolder(rootPath: string, directoryPath: string, folderName: string): Promise<string> {
+ return invoke("create_sql_folder_in_folder", { rootPath, directoryPath, folderName });
+}
+
+export async function renameSqlFolderInFolder(rootPath: string, folderPath: string, folderName: string): Promise<string> {
+ return invoke("rename_sql_folder_in_folder", { rootPath, folderPath, folderName });
+}
+
+export async function deleteSqlFolderInFolder(rootPath: string, folderPath: string): Promise<void> {
+ return invoke("delete_sql_folder_in_folder", { rootPath, folderPath });
+}
+
export interface GlobalSearchRequest {
roots: string[];
query: string;
diff --git a/apps/desktop/src/lib/sql/externalSqlFileTarget.ts b/apps/desktop/src/lib/sql/externalSqlFileTarget.ts
index bd6a12444a..4378bf1ae7 100644
--- a/apps/desktop/src/lib/sql/externalSqlFileTarget.ts
+++ b/apps/desktop/src/lib/sql/externalSqlFileTarget.ts
@@ -91,12 +91,32 @@ export function moveExternalSqlFileTarget(previousPath: string, nextPath: string
saveExternalSqlFileTargets([{ ...target, path: next, updatedAt: Date.now() }, ...remaining].slice(0, MAX_EXTERNAL_SQL_FILE_TARGETS));
}
+export function moveExternalSqlFolderTargets(previousPath: string, nextPath: string) {
+ const previous = normalizeExternalSqlPath(previousPath);
+ const next = normalizeExternalSqlPath(nextPath);
+ if (!previous || !next || previous === next) return;
+ const prefix = `${previous}/`;
+ const targets = loadExternalSqlFileTargets();
+ const moved = targets.filter((item) => item.path === previous || item.path.startsWith(prefix)).map((item) => ({ ...item, path: `${next}${item.path.slice(previous.length)}`, updatedAt: Date.now() }));
+ // Historical bindings at the destination must not attach to unrelated files
+ // that now occupy that directory, even when the source had no saved binding.
+ const remaining = targets.filter((item) => item.path !== previous && !item.path.startsWith(prefix) && item.path !== next && !item.path.startsWith(`${next}/`));
+ saveExternalSqlFileTargets([...moved, ...remaining].slice(0, MAX_EXTERNAL_SQL_FILE_TARGETS));
+}
+
export function forgetExternalSqlFileTarget(path: string) {
const normalizedPath = normalizeExternalSqlPath(path);
if (!normalizedPath) return;
saveExternalSqlFileTargets(loadExternalSqlFileTargets().filter((item) => item.path !== normalizedPath));
}
+export function forgetExternalSqlFolderTargets(path: string) {
+ const normalized = normalizeExternalSqlPath(path);
+ if (!normalized) return;
+ const prefix = `${normalized}/`;
+ saveExternalSqlFileTargets(loadExternalSqlFileTargets().filter((item) => item.path !== normalized && !item.path.startsWith(prefix)));
+}
+
export function resolveExternalSqlFileTarget(path: string, connectionExists: (connectionId: string) => boolean, fallback: ExternalSqlFileTarget): ExternalSqlFileTarget {
const normalizedPath = normalizeExternalSqlPath(path);
const saved = loadExternalSqlFileTargets().find((item) => item.path === normalizedPath);
diff --git a/apps/desktop/src/lib/sql/sqlFileOpen.ts b/apps/desktop/src/lib/sql/sqlFileOpen.ts
index 512d0c2911..9032303c54 100644
--- a/apps/desktop/src/lib/sql/sqlFileOpen.ts
+++ b/apps/desktop/src/lib/sql/sqlFileOpen.ts
@@ -48,6 +48,16 @@ export function normalizeExternalSqlPath(path: string): string {
return normalized.length > 1 ? normalized.replace(/\/$/, "") : normalized;
}
+export function relocateExternalSqlPathWithinFolder(path: string, previousFolderPath: string, nextFolderPath: string): string | null {
+ const normalizedPath = normalizeExternalSqlPath(path);
+ const previous = normalizeExternalSqlPath(previousFolderPath);
+ const next = normalizeExternalSqlPath(nextFolderPath);
+ if (!normalizedPath || !previous || !next || (normalizedPath !== previous && !normalizedPath.startsWith(`${previous}/`))) return null;
+ const nextPrefix = nextFolderPath.trim().replace(/[\\/]+$/, "");
+ if (!nextPrefix) return null;
+ return `${nextPrefix}${normalizedPath.slice(previous.length)}`;
+}
+
export function externalSqlFileDisplayTitles(paths: string[]): string[] {
const segments = paths.map((path) => normalizeExternalSqlPath(path).split("/").filter(Boolean));
const titles = segments.map((parts) => parts[parts.length - 1] || "script.sql");
diff --git a/apps/desktop/src/stores/__tests__/queryStore.externalSqlFolder.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.externalSqlFolder.spec.ts
new file mode 100644
index 0000000000..e07908ca58
--- /dev/null
+++ b/apps/desktop/src/stores/__tests__/queryStore.externalSqlFolder.spec.ts
@@ -0,0 +1,26 @@
+import { createPinia, setActivePinia } from "pinia";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("queryStore external SQL folders", () => {
+ beforeEach(() => {
+ vi.resetModules();
+ vi.unstubAllGlobals();
+ vi.stubGlobal("localStorage", {
+ getItem: vi.fn(() => null),
+ setItem: vi.fn(),
+ removeItem: vi.fn(),
+ });
+ vi.stubGlobal("window", { dispatchEvent: vi.fn() });
+ setActivePinia(createPinia());
+ });
+
+ it("keeps UNC paths fully qualified when their parent folder is renamed", async () => {
+ const { useQueryStore } = await import("@/stores/queryStore");
+ const queryStore = useQueryStore();
+ queryStore.openExternalSqlFile("", "", "\\\\server\\share\\old\\nested\\query.sql", "SELECT 1");
+
+ queryStore.relocateExternalSqlFolderPath("\\\\server\\share\\old", "\\\\server\\share\\renamed");
+
+ expect(queryStore.tabs.find((tab) => tab.externalSqlPath)?.externalSqlPath).toBe("\\\\server\\share\\renamed/nested/query.sql");
+ });
+});
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index 4d12a99d57..37bc4bdf1d 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -108,7 +108,7 @@ import { elasticsearchRestRequestRanges, executableStatementRanges, splitSqlStat
import type { SqlParameterOptions } from "@/lib/sql/sqlParameters";
import { replaceSqlServerLeadingUseQuery, sqlServerLeadingUseScript, switchesDatabaseWithUseStatement, useDatabaseFromStatement } from "@/lib/sql/sqlCompletionLookupTarget";
import { classifySqlRisk } from "@/lib/sql/sqlRisk";
-import { externalSqlFileDisplayTitles, normalizeExternalSqlPath } from "@/lib/sql/sqlFileOpen";
+import { externalSqlFileDisplayTitles, normalizeExternalSqlPath, relocateExternalSqlPathWithinFolder } from "@/lib/sql/sqlFileOpen";
import { clearDataGridPendingSnapshot, clearDataGridPendingSnapshotsForTab } from "@/composables/useDataGridEditor";
import { combineDataGridOrderByInputs, copyDataGridSortBuilderStatesForTab } from "@/composables/useDataGridSortBuilder";
import { beginClosingDataGridViewSnapshotsForTab, clearDataGridViewSnapshot, clearDataGridViewSnapshotsForTab } from "@/lib/dataGrid/dataGridViewStateCache";
@@ -4294,6 +4294,18 @@ export const useQueryStore = defineStore("query", () => {
refreshExternalSqlFileTitles();
}
+ function relocateExternalSqlFolderPath(previousPath: string, nextPath: string) {
+ const previous = normalizeExternalSqlPath(previousPath);
+ const next = normalizeExternalSqlPath(nextPath);
+ if (!previous || !next || previous === next) return;
+ for (const tab of tabs.value) {
+ if (tab.mode !== "query" || !tab.externalSqlPath) continue;
+ const relocated = relocateExternalSqlPathWithinFolder(tab.externalSqlPath, previousPath, nextPath);
+ if (relocated) tab.externalSqlPath = relocated;
+ }
+ refreshExternalSqlFileTitles();
+ }
+
function markExternalSqlFileMissingForPath(path: string) {
const normalizedPath = normalizeExternalSqlPath(path);
if (!normalizedPath) return;
@@ -4304,6 +4316,18 @@ export const useQueryStore = defineStore("query", () => {
}
}
+ function markExternalSqlFolderMissingForPath(path: string) {
+ const normalized = normalizeExternalSqlPath(path);
+ if (!normalized) return;
+ const prefix = `${normalized}/`;
+ for (const tab of tabs.value) {
+ if (tab.mode === "query" && tab.externalSqlPath) {
+ const tabPath = normalizeExternalSqlPath(tab.externalSqlPath);
+ if (tabPath === normalized || tabPath.startsWith(prefix)) tab.externalSqlFileMissing = true;
+ }
+ }
+ }
+
function persistSavedSqlEditorPosition(tab: QueryTab | undefined) {
if (!tab?.savedSqlId || tab.mode !== "query") return;
const pending = savedSqlEditorPositionTimers.get(tab.savedSqlId);
@@ -10105,7 +10129,9 @@ export const useQueryStore = defineStore("query", () => {
ignoreExternalSqlFileVersion,
acknowledgeExternalSqlFileMissing,
relocateExternalSqlFilePath,
+ relocateExternalSqlFolderPath,
markExternalSqlFileMissingForPath,
+ markExternalSqlFolderMissingForPath,
discardTabChanges,
requestAppCloseConfirmation,
closeOtherTabs,
diff --git a/src-tauri/src/commands/list_sql_files.rs b/src-tauri/src/commands/list_sql_files.rs
index 45e2468015..e344055bd6 100644
--- a/src-tauri/src/commands/list_sql_files.rs
+++ b/src-tauri/src/commands/list_sql_files.rs
@@ -43,6 +43,41 @@ fn validate_file_name(file_name: &str) -> Result<&str, String> {
Ok(file_name)
}
+fn validate_directory_name(directory_name: &str) -> Result<&str, String> {
+ let directory_name = directory_name.trim();
+ if directory_name.is_empty()
+ || directory_name == "."
+ || directory_name == ".."
+ || directory_name.contains(['/', '\\', '\0'])
+ {
+ return Err("Folder name must not contain a path".to_string());
+ }
+ let mut components = Path::new(directory_name).components();
+ if !matches!(components.next(), Some(std::path::Component::Normal(_))) || components.next().is_some() {
+ return Err("Folder name must not contain a path".to_string());
+ }
+ if is_pruned_dir(directory_name) {
+ return Err("This folder name is excluded from the SQL file browser".to_string());
+ }
+ Ok(directory_name)
+}
+
+// A directory entry itself must not be a symlink: canonicalizing one would
+// rename/delete its target instead of the entry the user selected.
+fn managed_child_directory(root_path: &str, folder_path: &str) -> Result<PathBuf, String> {
+ let metadata =
+ std::fs::symlink_metadata(folder_path).map_err(|error| format!("Failed to inspect SQL folder: {error}"))?;
+ if !metadata.file_type().is_dir() {
+ return Err("Only directories can be managed here".to_string());
+ }
+ let root = canonical_directory(Path::new(root_path), "SQL root folder")?;
+ let folder = managed_directory(root_path, folder_path)?;
+ if folder == root {
+ return Err("The opened root folder cannot be renamed or deleted".to_string());
+ }
+ Ok(folder)
+}
+
fn validate_sql_file_name(file_name: &str) -> Result<&str, String> {
let file_name = validate_file_name(file_name)?;
if !file_name.to_ascii_lowercase().ends_with(".sql") || file_name.len() <= 4 {
@@ -137,6 +172,16 @@ fn compile_file_filter(file_filter: &str) -> Result<Regex, String> {
}
fn scan_sql_files(dir: &Path, depth: usize, visited: &mut HashSet<String>, file_filter: &Regex) -> Vec<SqlFileEntry> {
+ scan_sql_files_with_directories(dir, depth, visited, file_filter, false)
+}
+
+fn scan_sql_files_with_directories(
+ dir: &Path,
+ depth: usize,
+ visited: &mut HashSet<String>,
+ file_filter: &Regex,
+ include_empty_directories: bool,
+) -> Vec<SqlFileEntry> {
if depth > MAX_SCAN_DEPTH {
return vec![];
}
@@ -172,8 +217,9 @@ fn scan_sql_files(dir: &Path, depth: usize, visited: &mut HashSet<String>, file_
if is_pruned_dir(&name) {
continue;
}
- let children = scan_sql_files(&path, depth + 1, visited, file_filter);
- if !children.is_empty() {
+ let children =
+ scan_sql_files_with_directories(&path, depth + 1, visited, file_filter, include_empty_directories);
+ if include_empty_directories || !children.is_empty() {
entries.push(SqlFileEntry { name, path: path.to_string_lossy().to_string(), is_dir: true, children });
}
} else if file_type.is_file() && file_filter.is_match(&name) {
@@ -201,6 +247,7 @@ fn scan_sql_files(dir: &Path, depth: usize, visited: &mut HashSet<String>, file_
pub async fn list_sql_files_in_folder(
folder_path: String,
file_filter: Option<String>,
+ include_empty_directories: Option<bool>,
) -> Result<Vec<SqlFileEntry>, String> {
let path = Path::new(&folder_path).to_path_buf();
let file_filter = compile_file_filter(file_filter.as_deref().unwrap_or(DEFAULT_FILE_FILTER))?;
@@ -212,7 +259,11 @@ pub async fn list_sql_files_in_folder(
return Err(format!("Path is not a directory: {}", folder_path));
}
let mut visited = HashSet::new();
- Ok(scan_sql_files(&path, 0, &mut visited, &file_filter))
+ Ok(if include_empty_directories.unwrap_or(false) {
+ scan_sql_files_with_directories(&path, 0, &mut visited, &file_filter, true)
+ } else {
+ scan_sql_files(&path, 0, &mut visited, &file_filter)
+ })
})
.await
.map_err(|e| format!("Failed to scan folder: {e}"))?
@@ -277,6 +328,77 @@ pub async fn delete_sql_file_in_folder(root_path: String, file_path: String) ->
.map_err(|error| format!("Failed to delete SQL file: {error}"))?
}
+#[tauri::command]
+pub async fn create_sql_folder_in_folder(
+ root_path: String,
+ directory_path: String,
+ folder_name: String,
+) -> Result<String, String> {
+ tauri::async_runtime::spawn_blocking(move || {
+ let folder_name = validate_directory_name(&folder_name)?.to_owned();
+ let directory = managed_directory(&root_path, &directory_path)?;
+ let root = canonical_directory(Path::new(&root_path), "SQL root folder")?;
+ if directory.strip_prefix(&root).map_err(|error| error.to_string())?.components().count() >= MAX_SCAN_DEPTH {
+ return Err("The maximum SQL folder depth has been reached".to_string());
+ }
+ let path = directory.join(&folder_name);
+ std::fs::create_dir(&path).map_err(|error| {
+ if error.kind() == std::io::ErrorKind::AlreadyExists {
+ "A file or folder with this name already exists".to_string()
+ } else {
+ format!("Failed to create SQL folder: {error}")
+ }
+ })?;
+ Ok(Path::new(&directory_path).join(folder_name).to_string_lossy().into_owned())
+ })
+ .await
+ .map_err(|error| format!("Failed to create SQL folder: {error}"))?
+}
+
+#[tauri::command]
+pub async fn rename_sql_folder_in_folder(
+ root_path: String,
+ folder_path: String,
+ folder_name: String,
+) -> Result<String, String> {
+ tauri::async_runtime::spawn_blocking(move || {
+ let folder_name = validate_directory_name(&folder_name)?.to_owned();
+ let folder = managed_child_directory(&root_path, &folder_path)?;
+ let parent = folder.parent().ok_or_else(|| "Failed to resolve SQL folder parent".to_string())?;
+ let target = parent.join(&folder_name);
+ // symlink_metadata also detects dangling links; never overwrite those.
+ match std::fs::symlink_metadata(&target) {
+ Ok(metadata) => {
+ if target == folder {
+ return Ok(folder_path);
+ }
+ // Permit case-only renames on case-insensitive filesystems,
+ // but never replace another directory or a symlink.
+ if !metadata.file_type().is_dir() || std::fs::canonicalize(&target).ok().as_ref() != Some(&folder) {
+ return Err("A file or folder with this name already exists".to_string());
+ }
+ }
+ Err(error) if error.kind() == std::io::ErrorKind::NotFound => {}
+ Err(error) => return Err(format!("Failed to inspect SQL folder target: {error}")),
+ }
+ std::fs::rename(&folder, &target).map_err(|error| format!("Failed to rename SQL folder: {error}"))?;
+ let parent_display = Path::new(&folder_path).parent().map(Path::to_path_buf).unwrap_or_default();
+ Ok(parent_display.join(folder_name).to_string_lossy().into_owned())
+ })
+ .await
+ .map_err(|error| format!("Failed to rename SQL folder: {error}"))?
+}
+
+#[tauri::command]
+pub async fn delete_sql_folder_in_folder(root_path: String, folder_path: String) -> Result<(), String> {
+ tauri::async_runtime::spawn_blocking(move || {
+ let folder = managed_child_directory(&root_path, &folder_path)?;
+ std::fs::remove_dir_all(&folder).map_err(|error| format!("Failed to delete SQL folder: {error}"))
+ })
+ .await
+ .map_err(|error| format!("Failed to delete SQL folder: {error}"))?
+}
+
#[cfg(test)]
mod tests {
use super::*;
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 801a46c010..5dd1542bf7 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -2238,6 +2238,9 @@ pub fn run() {
commands::list_sql_files::create_sql_file_in_folder,
commands::list_sql_files::rename_sql_file_in_folder,
commands::list_sql_files::delete_sql_file_in_folder,
+ commands::list_sql_files::create_sql_folder_in_folder,
+ commands::list_sql_files::rename_sql_folder_in_folder,
+ commands::list_sql_files::delete_sql_folder_in_folder,
commands::global_search::global_search,
commands::external_db::pending_open_db_files,
commands::keychain::read_keychain_password,