-
-
+
+
+
diff --git a/apps/desktop/src/lib/__tests__/connection/gbase8sConnectionDialog.spec.ts b/apps/desktop/src/lib/__tests__/connection/gbase8sConnectionDialog.spec.ts
index 4eeb385536..cc4ddaf267 100644
--- a/apps/desktop/src/lib/__tests__/connection/gbase8sConnectionDialog.spec.ts
+++ b/apps/desktop/src/lib/__tests__/connection/gbase8sConnectionDialog.spec.ts
@@ -2,6 +2,7 @@ import { readFileSync } from "node:fs";
import { parse } from "vue/compiler-sfc";
import ts from "typescript";
import { describe, expect, it } from "vitest";
+import { gbaseProfileFromConfig } from "@/lib/connection/gbaseProfiles";
const dialogSource = readFileSync(new URL("../../../components/connection/ConnectionDialog.vue", import.meta.url), "utf8");
const parsedDialog = parse(dialogSource, { filename: "ConnectionDialog.vue" });
@@ -18,17 +19,19 @@ function selectedProfileHarness(selectedTypeValue: string, driverProfile: string
}).outputText;
// The merged dialog checks plugin providers before the profile table; the
// plugin branch is stubbed out so this harness pins the GBase profile path.
- const selectedProfile = new Function("driverProfiles", "selectedType", "form", "parsePluginConnectionProviderOptionValue", "selectedPluginProvider", `${javascript}\nreturn selectedProfile;`)(
+ const selectedProfile = new Function("driverProfiles", "selectedType", "form", "parsePluginConnectionProviderOptionValue", "selectedPluginProvider", "gbaseProfileFromConfig", `${javascript}\nreturn selectedProfile;`)(
{
mysql: { label: "MySQL" },
gbase: { label: "南大通用 GBase 8a" },
gbase8a: { label: "南大通用 GBase 8a" },
gbase8s: { label: "南大通用 GBase 8s" },
+ gbase8c: { label: "南大通用 GBase 8c" },
},
{ value: selectedTypeValue },
- { value: { driver_profile: driverProfile } },
+ { value: { db_type: driverProfile === "gbase8c" ? "gbase8c" : "gbase", driver_profile: driverProfile } },
() => null,
{ value: null },
+ gbaseProfileFromConfig,
) as () => { label: string };
return selectedProfile();
}
@@ -37,6 +40,7 @@ describe("GBase 8s connection dialog", () => {
it.each([
["gbase8a", "南大通用 GBase 8a"],
["gbase8s", "南大通用 GBase 8s"],
+ ["gbase8c", "南大通用 GBase 8c"],
])("shows the active %s profile in the merged GBase type field", (profile, label) => {
expect(selectedProfileHarness("gbase", profile).label).toBe(label);
});
diff --git a/apps/desktop/src/lib/__tests__/connection/gbaseProfiles.spec.ts b/apps/desktop/src/lib/__tests__/connection/gbaseProfiles.spec.ts
new file mode 100644
index 0000000000..d191b9a838
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/connection/gbaseProfiles.spec.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+import { gbaseProfileFromConfig, isGbaseProfile } from "@/lib/connection/gbaseProfiles";
+
+describe("gbaseProfiles", () => {
+ it("recognizes the three GBase toggle profiles", () => {
+ expect(["gbase8a", "gbase8s", "gbase8c"].every(isGbaseProfile)).toBe(true);
+ expect(isGbaseProfile("gbase")).toBe(false);
+ expect(isGbaseProfile(undefined)).toBe(false);
+ });
+
+ it("resolves the toggle profile from a saved connection", () => {
+ expect(gbaseProfileFromConfig({ db_type: "gbase8c", driver_profile: "gbase8c" })).toBe("gbase8c");
+ expect(gbaseProfileFromConfig({ db_type: "gbase8c" })).toBe("gbase8c");
+ expect(gbaseProfileFromConfig({ db_type: "gbase", driver_profile: "gbase8s" })).toBe("gbase8s");
+ expect(gbaseProfileFromConfig({ db_type: "gbase", driver_profile: "gbase8a" })).toBe("gbase8a");
+ expect(gbaseProfileFromConfig({ db_type: "gbase", driver_profile: "gbase" })).toBe("gbase8a");
+ expect(gbaseProfileFromConfig({ db_type: "gbase" })).toBe("gbase8a");
+ });
+});
diff --git a/apps/desktop/src/lib/connection/gbaseProfiles.ts b/apps/desktop/src/lib/connection/gbaseProfiles.ts
new file mode 100644
index 0000000000..295a5ff729
--- /dev/null
+++ b/apps/desktop/src/lib/connection/gbaseProfiles.ts
@@ -0,0 +1,20 @@
+import type { ConnectionConfig } from "@/types/database";
+
+/**
+ * GBase 8a / 8s / 8c share one picker entry and one version toggle, but they are
+ * different engines: 8a and 8s are profiles of the `gbase` db type, while 8c is
+ * PostgreSQL-shaped and keeps its own `gbase8c` db type (the same split as
+ * OceanBase MySQL/Oracle mode). The toggle therefore switches `db_type` too.
+ */
+export const GBASE_PROFILES = ["gbase8a", "gbase8s", "gbase8c"] as const;
+
+export type GbaseProfile = (typeof GBASE_PROFILES)[number];
+
+export function isGbaseProfile(value: string | undefined | null): value is GbaseProfile {
+ return GBASE_PROFILES.includes(value as GbaseProfile);
+}
+
+export function gbaseProfileFromConfig(config: Pick