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。

fix(gbase8s): show locale/charset picker in routed create-db dialog

弈秋ca583c849d3d
diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
index b3130b82bf..409edb64ec 100644
--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { computed, nextTick, watch, onBeforeUnmount, inject, reactive, ref, shallowRef } from "vue";
-import { createRoutedSidebarDialogController } from "./sidebarDialogControllerRouting";
+import { createRoutedSidebarDialogController, routedCanSetCreateDatabaseCharset } from "./sidebarDialogControllerRouting";
import { useSqlHighlighter } from "@/composables/useSqlHighlighter";
import { useSidebarDataOpenRuntime } from "@/composables/useSidebarDataOpenRuntime";
import { useSidebarConnectionMutationRuntime } from "@/composables/useSidebarConnectionMutationRuntime";
@@ -680,7 +680,7 @@ function routeTreeItemDialogController() {
},
});
routedController.pasteTableDataCopySupported = pasteTableDataCopySupported.value;
- routedController.canSetCreateDatabaseCharset = canSetCreateDatabaseCharset.value;
+ routedController.canSetCreateDatabaseCharset = routedCanSetCreateDatabaseCharset(canSetCreateDatabaseCharset.value, canSetCreateDatabaseLocale.value);
routedController.canEditDatabaseCharsetCollation = canEditDatabaseCharsetCollation.value;
routedController.canEditDatabaseComment = canEditDatabaseComment.value;
emit("open-dialog-controller", routedController);
@@ -5280,7 +5280,7 @@ function databaseDialogCapabilities() {
return {
showCreateDatabaseDialog,
createDatabaseName,
- canSetCreateDatabaseCharset: canSetCreateDatabaseCharset.value || canSetCreateDatabaseLocale.value,
+ canSetCreateDatabaseCharset: routedCanSetCreateDatabaseCharset(canSetCreateDatabaseCharset.value, canSetCreateDatabaseLocale.value),
createDatabaseCharset,
createDatabaseCharsetOptions,
createDatabaseCharsetLoading,
diff --git a/apps/desktop/src/components/sidebar/__tests__/sidebarDialogControllerRouting.spec.ts b/apps/desktop/src/components/sidebar/__tests__/sidebarDialogControllerRouting.spec.ts
index 7f92204e23..1002f77c8d 100644
--- a/apps/desktop/src/components/sidebar/__tests__/sidebarDialogControllerRouting.spec.ts
+++ b/apps/desktop/src/components/sidebar/__tests__/sidebarDialogControllerRouting.spec.ts
@@ -1,6 +1,6 @@
import { describe, expect, it } from "vitest";
import { reactive, ref, toRefs } from "vue";
-import { createRoutedSidebarDialogController } from "@/components/sidebar/sidebarDialogControllerRouting";
+import { createRoutedSidebarDialogController, routedCanSetCreateDatabaseCharset } from "@/components/sidebar/sidebarDialogControllerRouting";
describe("createRoutedSidebarDialogController", () => {
it("keeps dialog open flags linked to the shared module refs", () => {
@@ -61,3 +61,20 @@ describe("createRoutedSidebarDialogController", () => {
expect(showCreateDatabaseDialog.value).toBe(false);
});
});
+
+describe("routedCanSetCreateDatabaseCharset", () => {
+ it("exposes the picker for locale-only dialects like GBase 8s (charset flag alone is false)", () => {
+ // Regression: the routed controller used to assign the raw charset-only value, hiding the
+ // create-database locale picker for GBase 8s / Informix even though the DB_LOCALE directive
+ // was still emitted.
+ expect(routedCanSetCreateDatabaseCharset(false, true)).toBe(true);
+ });
+
+ it("exposes the picker for charset-capable dialects like MySQL", () => {
+ expect(routedCanSetCreateDatabaseCharset(true, false)).toBe(true);
+ });
+
+ it("hides the picker when neither charset nor locale applies", () => {
+ expect(routedCanSetCreateDatabaseCharset(false, false)).toBe(false);
+ });
+});
diff --git a/apps/desktop/src/components/sidebar/sidebarDialogControllerRouting.ts b/apps/desktop/src/components/sidebar/sidebarDialogControllerRouting.ts
index 591a729823..70bf424a6c 100644
--- a/apps/desktop/src/components/sidebar/sidebarDialogControllerRouting.ts
+++ b/apps/desktop/src/components/sidebar/sidebarDialogControllerRouting.ts
@@ -27,3 +27,16 @@ export function createRoutedSidebarDialogController(
routedController.node = options.node;
return routedController;
}
+
+/**
+ * Whether the create-database dialog should expose its charset/locale picker.
+ *
+ * For MySQL-family dialects this is a charset+collation control gated by
+ * `canSetCreateDatabaseCharset`; for Informix-family dialects (GBase 8s) the same control is a
+ * locale selector gated by `canSetCreateDatabaseLocale`. Both the routed controller and
+ * `databaseDialogCapabilities()` must derive the flag from this single source, otherwise the two
+ * paths drift and the picker silently disappears for locale-only dialects.
+ */
+export function routedCanSetCreateDatabaseCharset(canSetCreateDatabaseCharset: boolean, canSetCreateDatabaseLocale: boolean): boolean {
+ return canSetCreateDatabaseCharset || canSetCreateDatabaseLocale;
+}