From 685aba00e2294cc811f5bc9789124c9212181afd Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Sun, 10 May 2026 22:41:04 +0800
Subject: [PATCH] fix: avoid disconnecting prefixed web pools

---
 src-web/src/routes/connection.rs | 35 ++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src-web/src/routes/connection.rs b/src-web/src/routes/connection.rs
index eb7791031..fcd5bcd99 100644
--- a/src-web/src/routes/connection.rs
+++ b/src-web/src/routes/connection.rs
@@ -78,9 +78,9 @@ pub async fn disconnect_db(
     let app = &state.app;
     let mut connections = app.connections.lock().await;
 
-    // Remove all pool keys that start with this connection_id
+    let pool_prefix = format!("{}:", body.connection_id);
     let keys_to_remove: Vec<String> =
-        connections.keys().filter(|k| k.starts_with(&body.connection_id)).cloned().collect();
+        connections.keys().filter(|k| *k == &body.connection_id || k.starts_with(&pool_prefix)).cloned().collect();
     for key in keys_to_remove {
         connections.remove(&key);
     }
@@ -116,11 +116,11 @@ async fn cache_connection_configs(state: &WebState, configs: &[ConnectionConfig]
 
 #[cfg(test)]
 mod tests {
-    use super::{save_connections, SaveConnectionsRequest};
+    use super::{disconnect_db, save_connections, DisconnectRequest, SaveConnectionsRequest};
     use crate::state::{LoginRateLimit, WebState};
     use axum::extract::State;
     use axum::Json;
-    use dbx_core::connection::AppState;
+    use dbx_core::connection::{AppState, PoolKind};
     use dbx_core::models::connection::{ConnectionConfig, DatabaseType};
     use dbx_core::storage::Storage;
     use std::collections::{HashMap, HashSet};
@@ -191,4 +191,31 @@ mod tests {
 
         let _ = std::fs::remove_dir_all(dir);
     }
+
+    #[tokio::test]
+    async fn disconnect_db_keeps_connections_with_similar_prefixes() {
+        let (state, dir) = test_web_state().await;
+        let conn_path = dir.join("conn.db");
+        let conn2_path = dir.join("conn2.db");
+        std::fs::File::create(&conn_path).unwrap();
+        std::fs::File::create(&conn2_path).unwrap();
+        let conn_pool = dbx_core::db::sqlite::connect_path(&conn_path.to_string_lossy()).await.unwrap();
+        let conn2_pool = dbx_core::db::sqlite::connect_path(&conn2_path.to_string_lossy()).await.unwrap();
+
+        {
+            let mut connections = state.app.connections.lock().await;
+            connections.insert("conn".to_string(), PoolKind::Sqlite(conn_pool));
+            connections.insert("conn2".to_string(), PoolKind::Sqlite(conn2_pool));
+        }
+
+        let result =
+            disconnect_db(State(state.clone()), Json(DisconnectRequest { connection_id: "conn".to_string() })).await;
+        assert!(result.is_ok());
+
+        let connections = state.app.connections.lock().await;
+        assert!(!connections.contains_key("conn"));
+        assert!(connections.contains_key("conn2"));
+
+        let _ = std::fs::remove_dir_all(dir);
+    }
 }