fix(grid): parse mysql enum type suffixes

This commit is contained in:
t8y2 committed 2026-06-30 23:20:43 +08:00
1 parent f1f99f6f10
commit 16a1d4b1dd
2 files changed
+32 -16

No files matched your search

+23 -16
View File
@@ -17,37 +17,44 @@ export function isEnumColumn(columnInfo: Pick<ColumnInfo, "data_type"> | undefin
export function enumValuesForColumn(columnInfo: Pick<ColumnInfo, "data_type"> | undefined): string[] { export function enumValuesForColumn(columnInfo: Pick<ColumnInfo, "data_type"> | undefined): string[] {
if (!isEnumColumn(columnInfo)) return []; if (!isEnumColumn(columnInfo)) return [];
const raw = columnInfo!.data_type.trim(); const raw = columnInfo!.data_type.trim();
const inner = raw.match(/^enum\s*\(\s*(.+?)\s*\)\s*$/is)?.[1]; const match = raw.match(/^enum\s*\(/i);
if (!inner) return []; if (!match) return [];
const values: string[] = []; const values: string[] = [];
let i = 0; let i = match[0].length;
while (i < inner.length) { while (i < raw.length) {
// Skip whitespace and commas between values // MySQL may append CHARACTER SET/COLLATE after the enum value list.
while (i < inner.length && (inner[i] === " " || inner[i] === ",")) i++; if (raw[i] === ")") {
if (i >= inner.length) break; i++;
return i >= raw.length || /\s/.test(raw[i]) ? values : [];
}
if (inner[i] !== "'") break; // unexpected token while (i < raw.length && (/\s/.test(raw[i]) || raw[i] === ",")) i++;
if (i >= raw.length) break;
if (raw[i] === ")") continue;
i++; // skip opening quote if (raw[i] !== "'") return [];
i++;
let value = ""; let value = "";
while (i < inner.length) { let closed = false;
if (inner[i] === "'") { while (i < raw.length) {
if (i + 1 < inner.length && inner[i + 1] === "'") { if (raw[i] === "'") {
// Escaped single quote: '' if (i + 1 < raw.length && raw[i + 1] === "'") {
value += "'"; value += "'";
i += 2; i += 2;
} else { } else {
// Closing quote
i++; i++;
closed = true;
break; break;
} }
} else { } else {
value += inner[i]; value += raw[i];
i++; i++;
} }
} }
if (!closed) return [];
values.push(value); values.push(value);
} }
return values; return [];
} }
@@ -31,6 +31,15 @@ test("parses enum with escaped single quotes", () => {
assert.deepEqual(enumValuesForColumn({ data_type: "enum('it''s','normal')" }), ["it's", "normal"]); assert.deepEqual(enumValuesForColumn({ data_type: "enum('it''s','normal')" }), ["it's", "normal"]);
}); });
test("parses MySQL enum values with charset and collation suffixes", () => {
assert.deepEqual(
enumValuesForColumn({
data_type: "enum('id','string','text','long','double','bool','date','datetime','object','secret') CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci",
}),
["id", "string", "text", "long", "double", "bool", "date", "datetime", "object", "secret"],
);
});
test("returns empty array for non-enum types", () => { test("returns empty array for non-enum types", () => {
assert.deepEqual(enumValuesForColumn({ data_type: "varchar(255)" }), []); assert.deepEqual(enumValuesForColumn({ data_type: "varchar(255)" }), []);
assert.deepEqual(enumValuesForColumn(undefined), []); assert.deepEqual(enumValuesForColumn(undefined), []);