diff --git a/crates/dbx-core/src/cloud_sync.rs b/crates/dbx-core/src/cloud_sync.rs index f00acc3223..2d672c49f5 100644 --- a/crates/dbx-core/src/cloud_sync.rs +++ b/crates/dbx-core/src/cloud_sync.rs @@ -502,6 +502,7 @@ mod tests { ssh_key_passphrase: "key".to_string(), ssh_expose_lan: false, ssh_connect_timeout_secs: 5, + connect_timeout_secs: 5, query_timeout_secs: 30, proxy_enabled: false, proxy_type: ProxyType::Socks5, diff --git a/crates/dbx-core/src/connection.rs b/crates/dbx-core/src/connection.rs index 2f05afb117..d08552057c 100644 --- a/crates/dbx-core/src/connection.rs +++ b/crates/dbx-core/src/connection.rs @@ -885,7 +885,7 @@ mod tests { redacted_connection_url_for_endpoint, uses_tcp_probe, AppState, PoolKind, }; use crate::db; - use crate::models::connection::{ConnectionConfig, DatabaseType, ProxyType}; + use crate::models::connection::{default_connect_timeout_secs, ConnectionConfig, DatabaseType, ProxyType}; use crate::schema; use crate::storage::Storage; @@ -914,6 +914,7 @@ mod tests { ssh_key_passphrase: String::new(), ssh_expose_lan: false, ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(), + connect_timeout_secs: default_connect_timeout_secs(), query_timeout_secs: crate::models::connection::default_query_timeout_secs(), proxy_enabled: false, proxy_type: ProxyType::Socks5, @@ -1175,9 +1176,11 @@ mod tests { async fn assert_live_postgres_like_query(config: ConnectionConfig) { let url = connection_url_for_endpoint(&config, &config.host, config.port); - let pool = db::postgres::connect(&url).await.unwrap_or_else(|err| { - panic!("failed to connect to {:?} at {}:{}: {}", config.db_type, config.host, config.port, err) - }); + let pool = db::postgres::connect(&url, std::time::Duration::from_secs(config.effective_connect_timeout_secs())) + .await + .unwrap_or_else(|err| { + panic!("failed to connect to {:?} at {}:{}: {}", config.db_type, config.host, config.port, err) + }); let result = db::postgres::execute_query(&pool, "SELECT current_database(), current_schema()").await.unwrap_or_else( |err| panic!("failed to query {:?} at {}:{}: {}", config.db_type, config.host, config.port, err), diff --git a/crates/dbx-core/src/connection_secrets.rs b/crates/dbx-core/src/connection_secrets.rs index b871fbf81f..3c7d855c09 100644 --- a/crates/dbx-core/src/connection_secrets.rs +++ b/crates/dbx-core/src/connection_secrets.rs @@ -312,6 +312,7 @@ mod tests { ssh_key_passphrase: String::new(), ssh_expose_lan: false, ssh_connect_timeout_secs: crate::models::connection::default_ssh_connect_timeout_secs(), + connect_timeout_secs: crate::models::connection::default_connect_timeout_secs(), query_timeout_secs: crate::models::connection::default_query_timeout_secs(), proxy_enabled: false, proxy_type: ProxyType::Socks5, diff --git a/crates/dbx-core/src/db/mysql.rs b/crates/dbx-core/src/db/mysql.rs index e76f9a3846..34f06e674c 100644 --- a/crates/dbx-core/src/db/mysql.rs +++ b/crates/dbx-core/src/db/mysql.rs @@ -1271,7 +1271,7 @@ mod tests { #[ignore = "requires remote MariaDB with ed25519 user"] async fn test_ed25519_auth() { let url = "mysql://edtest:test123@172.26.128.159:20026/testdb"; - let pool = super::connect(url).await.expect("connect with ed25519"); + let pool = super::connect(url, std::time::Duration::from_secs(5)).await.expect("connect with ed25519"); let mut conn = pool.get_conn().await.expect("get connection"); conn.ping().await.expect("ping"); let _ = conn.disconnect().await; diff --git a/crates/dbx-core/src/models/connection.rs b/crates/dbx-core/src/models/connection.rs index f142cd5ea9..ea3be1e1dd 100644 --- a/crates/dbx-core/src/models/connection.rs +++ b/crates/dbx-core/src/models/connection.rs @@ -857,6 +857,7 @@ mod tests { ssh_key_passphrase: String::new(), ssh_expose_lan: false, ssh_connect_timeout_secs: default_ssh_connect_timeout_secs(), + connect_timeout_secs: super::default_connect_timeout_secs(), query_timeout_secs: default_query_timeout_secs(), proxy_enabled: false, proxy_type: ProxyType::Socks5, diff --git a/crates/dbx-core/src/query.rs b/crates/dbx-core/src/query.rs index e20a5fd81e..07d0a7f7c3 100644 --- a/crates/dbx-core/src/query.rs +++ b/crates/dbx-core/src/query.rs @@ -1406,6 +1406,7 @@ mod tests { ssh_key_passphrase: String::new(), ssh_expose_lan: false, ssh_connect_timeout_secs: 5, + connect_timeout_secs: 5, query_timeout_secs: 30, proxy_enabled: false, proxy_type: ProxyType::Socks5, diff --git a/crates/dbx-core/src/transfer.rs b/crates/dbx-core/src/transfer.rs index bc2318fd96..ae12e6d750 100644 --- a/crates/dbx-core/src/transfer.rs +++ b/crates/dbx-core/src/transfer.rs @@ -1246,6 +1246,7 @@ mod tests { ssh_key_passphrase: String::new(), ssh_expose_lan: false, ssh_connect_timeout_secs: 5, + connect_timeout_secs: 5, query_timeout_secs: 30, proxy_enabled: false, proxy_type: crate::models::connection::ProxyType::Socks5,