From ad7797f45155ccc3e70a8f3dd538affadabcf180 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 25 May 2026 11:42:47 +0800 Subject: [PATCH] fix: remove macOS tray icon title and add SQL Server TOP test - Remove the "DBX" title text from the macOS menu bar tray icon so it only displays the icon, matching Windows behavior - Add test for SQL Server TOP pagination with aggregate queries like COUNT(*) --- crates/dbx-core/src/query_result_sql.rs | 13 +++++++++++++ src-tauri/src/lib.rs | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/crates/dbx-core/src/query_result_sql.rs b/crates/dbx-core/src/query_result_sql.rs index c8180ddf19..ad1081fe0a 100644 --- a/crates/dbx-core/src/query_result_sql.rs +++ b/crates/dbx-core/src/query_result_sql.rs @@ -575,6 +575,19 @@ mod tests { assert_eq!(result.sql.unwrap(), "SELECT TOP (100) id FROM users ORDER BY id DESC"); } + #[test] + fn uses_sqlserver_top_for_count_queries_without_derived_table() { + let result = build_paginated_query_sql(PaginatedQuerySqlOptions { + original_sql: "SELECT COUNT(*) FROM TicketInfo".to_string(), + database_type: Some(DatabaseType::SqlServer), + limit: 100, + offset: 0, + }); + + assert_eq!(result.ok, true); + assert_eq!(result.sql.unwrap(), "SELECT TOP (100) COUNT(*) FROM TicketInfo"); + } + #[test] fn wraps_sqlserver_select_with_unnamed_column() { let result = build_paginated_query_sql(PaginatedQuerySqlOptions { diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index cbc1c36b34..c92a99dc21 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -54,11 +54,6 @@ fn setup_desktop_tray>(manager: &M) -> tauri::R let menu = MenuBuilder::new(manager).text("show", "Show DBX").separator().text("quit", "Quit DBX").build()?; let mut tray = TrayIconBuilder::::with_id(DESKTOP_TRAY_ID).tooltip("DBX").menu(&menu).show_menu_on_left_click(false); - #[cfg(target_os = "macos")] - { - tray = tray.title("DBX"); - } - if let Some(icon) = manager.app_handle().default_window_icon().cloned() { tray = tray.icon(icon); }