From ad7db2cb494d901ea24a42397eba1b0f64ba1977 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Tue, 26 May 2026 22:58:20 +0800 Subject: [PATCH] chore: format rust sources --- crates/dbx-core/src/db/mysql.rs | 8 ++------ crates/dbx-core/src/db/postgres.rs | 4 +--- crates/dbx-core/src/query_result_sql.rs | 22 ++++------------------ 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs index 39ca7ce1e..568267b4c 100644 --- a/crates/dbx-core/src/db/mysql.rs +++ b/crates/dbx-core/src/db/mysql.rs @@ -143,9 +143,7 @@ fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_json::Value }) .or_else(|| row_get::(row, idx).map(|v| serde_json::Value::String(v.to_string()))) .or_else(|| row_get::(row, idx).map(|v| serde_json::Value::String(v.to_string()))) - .or_else(|| { - row_get::, _>(row, idx).map(|bytes| mysql_bytes_to_json(bytes, column)) - }) + .or_else(|| row_get::, _>(row, idx).map(|bytes| mysql_bytes_to_json(bytes, column))) .unwrap_or(serde_json::Value::Null); } return row @@ -204,9 +202,7 @@ fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_json::Value }) }) .or_else(|| row_get::(row, idx).map(serde_json::Value::Bool)) - .or_else(|| { - row_get::, _>(row, idx).map(|bytes| mysql_bytes_to_json(bytes, column)) - }) + .or_else(|| row_get::, _>(row, idx).map(|bytes| mysql_bytes_to_json(bytes, column))) .unwrap_or(serde_json::Value::Null) } diff --git a/crates/dbx-core/src/db/postgres.rs b/crates/dbx-core/src/db/postgres.rs index 1805c832d..1023ab016 100644 --- a/crates/dbx-core/src/db/postgres.rs +++ b/crates/dbx-core/src/db/postgres.rs @@ -201,9 +201,7 @@ fn pg_value_to_json(row: &Row, idx: usize, type_name: &str) -> serde_json::Value .or_else(|_| row.try_get::<_, bool>(idx).map(serde_json::Value::Bool)) .or_else(|_| row.try_get::<_, uuid::Uuid>(idx).map(|v| serde_json::Value::String(v.to_string()))) .or_else(|e| pg_temporal_to_json_value(row, idx).ok_or(e)) - .or_else(|_| { - row.try_get::<_, Vec>(idx).map(|bytes| super::binary_value_to_json(&bytes)) - }) + .or_else(|_| row.try_get::<_, Vec>(idx).map(|bytes| super::binary_value_to_json(&bytes))) .unwrap_or(serde_json::Value::Null) } diff --git a/crates/dbx-core/src/query_result_sql.rs b/crates/dbx-core/src/query_result_sql.rs index d59a9e9da..6ec973bd8 100644 --- a/crates/dbx-core/src/query_result_sql.rs +++ b/crates/dbx-core/src/query_result_sql.rs @@ -361,11 +361,7 @@ fn add_fetch_first_limit(statement: &str, limit: usize, offset: usize) -> String if has_top_level_fetch_first(statement) { return format!("{statement};"); } - let offset_sql = if offset > 0 { - format!(" OFFSET {offset} ROWS") - } else { - String::new() - }; + let offset_sql = if offset > 0 { format!(" OFFSET {offset} ROWS") } else { String::new() }; format!("{statement}{offset_sql} FETCH FIRST {limit} ROWS ONLY;") } @@ -373,11 +369,7 @@ fn add_standard_limit(statement: &str, limit: usize, offset: usize) -> String { if has_top_level_limit(statement) { return format!("{statement};"); } - let offset_sql = if offset > 0 { - format!(" OFFSET {offset}") - } else { - String::new() - }; + let offset_sql = if offset > 0 { format!(" OFFSET {offset}") } else { String::new() }; format!("{statement} LIMIT {limit}{offset_sql};") } @@ -599,10 +591,7 @@ mod tests { }); assert_eq!(result.ok, true); - assert_eq!( - result.sql.unwrap(), - "SELECT id, name FROM users LIMIT 100 OFFSET 200;" - ); + assert_eq!(result.sql.unwrap(), "SELECT id, name FROM users LIMIT 100 OFFSET 200;"); } #[test] @@ -678,10 +667,7 @@ mod tests { offset: 0, }); - assert_eq!( - result.sql.unwrap(), - "SELECT id FROM users FETCH FIRST 100 ROWS ONLY;" - ); + assert_eq!(result.sql.unwrap(), "SELECT id FROM users FETCH FIRST 100 ROWS ONLY;"); } #[test]