From b0a20e836421f5143ad77f5a04e22d46967a7ccb Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Thu, 16 Jul 2026 16:40:25 +0800 Subject: [PATCH] fix(mysql): identify enum and set result columns --- crates/dbx-core/src/db/mysql.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs index 707f45250a..8ee79fc004 100644 --- a/crates/dbx-core/src/db/mysql.rs +++ b/crates/dbx-core/src/db/mysql.rs @@ -293,6 +293,7 @@ fn mysql_bytes_to_json(bytes: Vec, column: &mysql_async::Column) -> serde_js pub(crate) fn mysql_column_type_name(column: &mysql_async::Column) -> String { use mysql_async::consts::ColumnType::*; let ty = column.column_type(); + let flags = column.flags(); let binary = is_mysql_binary_charset(column); match ty { MYSQL_TYPE_TINY => "tinyint", @@ -348,7 +349,13 @@ pub(crate) fn mysql_column_type_name(column: &mysql_async::Column) -> String { } } MYSQL_TYPE_STRING => { - if binary { + // MySQL reports ENUM/SET result columns as STRING plus a flag, + // rather than using the dedicated protocol type codes. + if flags.contains(mysql_async::consts::ColumnFlags::ENUM_FLAG) { + "enum" + } else if flags.contains(mysql_async::consts::ColumnFlags::SET_FLAG) { + "set" + } else if binary { "binary" } else { "char" @@ -3924,6 +3931,14 @@ mod tests { mysql_column_type_name(&mysql_test_column(MYSQL_TYPE_STRING, utf8, ColumnFlags::empty(), 16)), "char" ); + assert_eq!( + mysql_column_type_name(&mysql_test_column(MYSQL_TYPE_STRING, utf8, ColumnFlags::ENUM_FLAG, 16)), + "enum" + ); + assert_eq!( + mysql_column_type_name(&mysql_test_column(MYSQL_TYPE_STRING, utf8, ColumnFlags::SET_FLAG, 16)), + "set" + ); assert_eq!( mysql_column_type_name(&mysql_test_column(MYSQL_TYPE_DATETIME, utf8, ColumnFlags::empty(), 19)), "datetime"