From 20622bc76209b945d459deb48fed57ae52c77daa Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Wed, 10 Jun 2026 20:05:20 +0800 Subject: [PATCH] fix: resolve clippy warnings and missing redis_key_separator field --- crates/dbx-core/src/db/elasticsearch_sql.rs | 2 +- crates/dbx-core/src/query_execution_sql.rs | 2 +- src-tauri/src/commands/connection.rs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/dbx-core/src/db/elasticsearch_sql.rs b/crates/dbx-core/src/db/elasticsearch_sql.rs index 860659c61..36694e134 100644 --- a/crates/dbx-core/src/db/elasticsearch_sql.rs +++ b/crates/dbx-core/src/db/elasticsearch_sql.rs @@ -264,7 +264,7 @@ fn translate_order_by(items: &[OrderByExpr]) -> Result, String> { fn extract_limit_offset(query: &Query) -> Result<(Option, Option), String> { let limit = match &query.limit_clause { Some(sqlparser::ast::LimitClause::LimitOffset { limit, .. }) => { - limit.as_ref().map(|expr| usize_literal(expr)).transpose()? + limit.as_ref().map(usize_literal).transpose()? } _ => None, }; diff --git a/crates/dbx-core/src/query_execution_sql.rs b/crates/dbx-core/src/query_execution_sql.rs index 9df9c43d2..f1f307ff6 100644 --- a/crates/dbx-core/src/query_execution_sql.rs +++ b/crates/dbx-core/src/query_execution_sql.rs @@ -169,7 +169,7 @@ fn is_safe_read_pragma(upper_stripped: &str) -> bool { let pragma_name = &rest[..name_end]; // Check if it's in the safe list - if !SAFE_READ_PRAGMA_NAMES.iter().any(|&safe| pragma_name == safe) { + if !SAFE_READ_PRAGMA_NAMES.contains(&pragma_name) { return false; } diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs index 5dbcb4649..b9ea5b3f8 100644 --- a/src-tauri/src/commands/connection.rs +++ b/src-tauri/src/commands/connection.rs @@ -190,6 +190,7 @@ mod tests { redis_sentinel_password: String::new(), redis_sentinel_tls: false, redis_cluster_nodes: String::new(), + redis_key_separator: dbx_core::models::connection::default_redis_key_separator(), etcd_endpoints: String::new(), external_config: None, jdbc_driver_class: None,