From 880b6ac6e169363a2198dc2626228d5e1018f937 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 6 Jul 2026 11:03:28 +0800 Subject: [PATCH] fix(mysql): show server-provided collations --- .../database/createDatabaseCharsetOptions.spec.ts | 4 ++-- .../src/lib/database/createDatabaseCharsetOptions.ts | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/desktop/src/lib/__tests__/database/createDatabaseCharsetOptions.spec.ts b/apps/desktop/src/lib/__tests__/database/createDatabaseCharsetOptions.spec.ts index 9327196956..1674d589e0 100644 --- a/apps/desktop/src/lib/__tests__/database/createDatabaseCharsetOptions.spec.ts +++ b/apps/desktop/src/lib/__tests__/database/createDatabaseCharsetOptions.spec.ts @@ -44,7 +44,7 @@ describe("createDatabaseCharsetOptions", () => { expect(metadata.collationsByCharset.gbk).toEqual(["gbk_chinese_ci"]); }); - it("keeps server-provided utf8mb4 collations while hiding 0900 entries from the dropdown", () => { + it("keeps server-provided MySQL 8 utf8mb4 collations", () => { const metadata = parseCreateDatabaseCharsetMetadata( { columns: ["Charset", "Description", "Default collation", "Maxlen"], @@ -62,7 +62,7 @@ describe("createDatabaseCharsetOptions", () => { }, ); - expect(metadata.collationsByCharset.utf8mb4).toEqual(["utf8mb4_general_ci", "utf8mb4_unicode_ci", "utf8mb4_unicode_520_ci", "utf8mb4_bin"]); + expect(metadata.collationsByCharset.utf8mb4).toEqual(["utf8mb4_0900_ai_ci", "utf8mb4_general_ci", "utf8mb4_unicode_ci", "utf8mb4_unicode_520_ci", "utf8mb4_bin"]); }); it("keeps custom collations unless the previous value was the old charset default", () => { diff --git a/apps/desktop/src/lib/database/createDatabaseCharsetOptions.ts b/apps/desktop/src/lib/database/createDatabaseCharsetOptions.ts index 63cfd31aa2..d84e662963 100644 --- a/apps/desktop/src/lib/database/createDatabaseCharsetOptions.ts +++ b/apps/desktop/src/lib/database/createDatabaseCharsetOptions.ts @@ -66,7 +66,7 @@ export function parseCreateDatabaseCharsetMetadata(charsetResult: QueryLikeResul for (const row of collationResult.rows) { const collation = cellString(row[collationNameIndex]); const charset = normalizeCreateDatabaseCharsetKey(cellString(row[collationCharsetIndex])); - if (!collation || !charset || isHiddenCreateDatabaseCollation(collation)) continue; + if (!collation || !charset) continue; collationsByCharset[charset] ??= []; if (isDefaultFlag(row[collationDefaultIndex])) { collationsByCharset[charset].unshift(collation); @@ -78,7 +78,7 @@ export function parseCreateDatabaseCharsetMetadata(charsetResult: QueryLikeResul for (const row of charsetResult.rows) { const charset = normalizeCreateDatabaseCharsetKey(cellString(row[charsetNameIndex])); const defaultCollation = cellString(row[charsetDefaultCollationIndex]); - if (!charset || !defaultCollation || isHiddenCreateDatabaseCollation(defaultCollation)) continue; + if (!charset || !defaultCollation) continue; collationsByCharset[charset] ??= []; const existingIndex = collationsByCharset[charset].indexOf(defaultCollation); if (existingIndex > 0) collationsByCharset[charset].splice(existingIndex, 1); @@ -105,10 +105,6 @@ function uniqueStrings(values: string[]): string[] { return [...new Set(values.filter(Boolean))]; } -function isHiddenCreateDatabaseCollation(value: string): boolean { - return value.toLowerCase().includes("_0900_"); -} - function isDefaultFlag(value: unknown): boolean { if (value === true) return true; if (typeof value !== "string") return false;