From 195c880097dc1e6f9b8e687f9bc0ed877cf89e17 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 10 Aug 2026 12:49:10 +0800 Subject: [PATCH] fix(mysql): read scalar metadata from the first column Closes #5746 --- Cargo.lock | 1 + crates/dbx-core/Cargo.toml | 3 ++ crates/dbx-core/src/db/mysql.rs | 68 ++++++++++++++++++++++++++++++--- 3 files changed, 67 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b9880ed45..54220fc43b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1745,6 +1745,7 @@ dependencies = [ "minijinja", "mongodb", "mysql_async", + "mysql_common", "notify", "pageant", "percent-encoding", diff --git a/crates/dbx-core/Cargo.toml b/crates/dbx-core/Cargo.toml index a91d127022..aa6a7b8610 100644 --- a/crates/dbx-core/Cargo.toml +++ b/crates/dbx-core/Cargo.toml @@ -82,3 +82,6 @@ tempfile = "3" [target.'cfg(not(all(windows, target_vendor = "win7")))'.dependencies] iana-time-zone = "0.1" + +[dev-dependencies] +mysql_common = { git = "https://github.com/t8y2/rust_mysql_common.git", rev = "47740d85a8277167a5717afac785d37b46a36296", default-features = false } diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs index e29a08819e..703d02fee9 100644 --- a/crates/dbx-core/src/db/mysql.rs +++ b/crates/dbx-core/src/db/mysql.rs @@ -100,6 +100,23 @@ where row.get_opt::(index).and_then(|result| result.ok()) } +fn first_column_value(row: &mysql_async::Row) -> Option +where + T: mysql_async::prelude::FromValue, +{ + row_get(row, 0) +} + +async fn query_first_column(conn: &mut mysql_async::Conn, sql: &str) -> Result, mysql_async::Error> +where + T: mysql_async::prelude::FromValue, +{ + // Some MySQL-compatible servers return extra columns for scalar queries. + // Convert only column zero so mysql_async does not panic on the row width. + let row = conn.query_first::(sql).await?; + Ok(row.as_ref().and_then(first_column_value)) +} + /// 字节转 String:合法 UTF-8(绝大多数场景)时直接复用入参缓冲零拷贝, /// 仅在非法序列时退化为 lossy 替换。from_utf8_lossy(&b).to_string() 即使 /// 对合法输入也会多一次分配+拷贝。 @@ -148,9 +165,8 @@ fn nonblank(value: String) -> Option { async fn query_first_nonblank_string(conn: &mut mysql_async::Conn, sql: &str) -> Option { // MySQL reports nullable metadata such as TABLE_COLLATION as NULL for views. // Reading it as String makes mysql_async panic during row conversion. - match conn.query_first::, _>(sql).await { - Ok(Some(value)) => value.and_then(nonblank), - Ok(None) => None, + match query_first_column::(conn, sql).await { + Ok(value) => value.and_then(nonblank), Err(error) => { log::debug!("Failed to read optional MySQL database information with `{sql}`: {error}"); None @@ -1286,7 +1302,7 @@ async fn enable_explicit_timestamp_defaults_for_query(conn: &mut mysql_async::Co return None; } - let previous = match conn.query_first::("SELECT @@SESSION.explicit_defaults_for_timestamp").await { + let previous = match query_first_column::(conn, "SELECT @@SESSION.explicit_defaults_for_timestamp").await { Ok(Some(value)) => value != 0, Ok(None) => { log::debug!("Skipping MySQL explicit timestamp defaults compatibility setting: variable was empty"); @@ -4187,7 +4203,7 @@ pub async fn execute_query(pool: &MySqlPool, sql: &str, bare: bool) -> Result Result { let mut conn = get_conn_with_health_check(pool).await?; - conn.query_first::("SELECT @@max_allowed_packet") + query_first_column::(&mut conn, "SELECT @@max_allowed_packet") .await .map_err(|error| error.to_string())? .ok_or_else(|| "MySQL did not return @@max_allowed_packet".to_string()) @@ -5188,6 +5204,48 @@ pub async fn list_triggers(pool: &MySqlPool, database: &str, table: &str) -> Res #[cfg(test)] mod tests { use super::*; + use mysql_async::{consts::ColumnType, Column, Value}; + use mysql_common::row::new_row; + + fn mysql_test_row(values: Vec) -> mysql_async::Row { + let columns = values + .iter() + .enumerate() + .map(|(index, _)| { + Column::new(ColumnType::MYSQL_TYPE_VAR_STRING).with_name(format!("column_{index}").as_bytes()) + }) + .collect::>() + .into(); + new_row(values, columns) + } + + #[test] + fn mysql_first_column_value_ignores_extra_result_columns() { + let row = mysql_async::from_row::(mysql_test_row(vec![ + Value::Bytes(Vec::new()), + Value::Bytes(Vec::new()), + ])); + + assert_eq!(first_column_value::(&row), Some(String::new())); + } + + #[test] + fn mysql_first_column_value_handles_null_and_conversion_failures() { + let null_row = mysql_test_row(vec![Value::NULL, Value::Bytes(b"ignored".to_vec())]); + let invalid_number_row = mysql_test_row(vec![Value::Bytes(b"not-a-number".to_vec())]); + + assert_eq!(first_column_value::(&null_row), None); + assert_eq!(first_column_value::(&invalid_number_row), None); + } + + #[test] + fn mysql_first_column_value_reads_integer_metadata() { + let enabled_row = mysql_test_row(vec![Value::Int(1), Value::Bytes(b"ignored".to_vec())]); + let packet_row = mysql_test_row(vec![Value::UInt(67_108_864), Value::Bytes(b"ignored".to_vec())]); + + assert_eq!(first_column_value::(&enabled_row), Some(1)); + assert_eq!(first_column_value::(&packet_row), Some(67_108_864)); + } #[test] fn mysql_info_message_maps_non_empty_info_strings() {