25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
test(ci): isolate fixture ports and wait for TDengine VGroups (#13086)
efeire01f41f58599f
diff --git a/Cargo.lock b/Cargo.lockindex 6a48c819cb..ddaa3432bb 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2414,7 +2414,6 @@ dependencies = ["log","openssl","percent-encoding",- "portpicker","postgres-openssl","rustls 0.23.43","rustls-pemfile 2.2.0",diff --git a/agents/drivers/tdengine/tests/live.rs b/agents/drivers/tdengine/tests/live.rsindex d029a8d833..a752f4143c 100644--- a/agents/drivers/tdengine/tests/live.rs+++ b/agents/drivers/tdengine/tests/live.rs@@ -2,6 +2,7 @@ use std::collections::HashSet;use std::env;use std::io::{BufRead, BufReader, Write};use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio};+use std::time::{Duration, Instant};use serde_json::{json, Value};@@ -65,6 +66,78 @@ fn integration_params() -> Option<Value> {}))}+fn wait_for_database_ready(mut query: impl FnMut() -> Value, timeout: Duration) -> Result<(), String> {+ let started = Instant::now();+ loop {+ let result = query();+ let columns = result["columns"].as_array().expect("VGroup columns");+ // Servers before 3.3.8 do not expose the is_ready column.+ let Some(ready_column) = columns.iter().position(|column| column == "is_ready") else {+ return Ok(());+ };+ let rows = result["rows"].as_array().expect("VGroup rows");+ if !rows.is_empty() && rows.iter().all(|row| row[ready_column] == true) {+ return Ok(());+ }+ if started.elapsed() >= timeout {+ return Err(format!("VGroups did not become ready: {result}"));+ }+ std::thread::sleep(Duration::from_millis(200));+ }+}++fn create_database(agent: &mut AgentProcess, session_id: &str, database: &str) {+ agent.call(+ "execute_batch",+ json!({"agentSessionId": session_id, "statements": [format!("CREATE DATABASE IF NOT EXISTS {database}")]}),+ );+ wait_for_database_ready(+ || {+ agent.call(+ "execute_query",+ json!({+ "agentSessionId": session_id,+ "schema": database,+ "sql": "SHOW VGROUPS",+ "maxRows": 1000,+ "timeoutSecs": 5+ }),+ )+ },+ Duration::from_secs(30),+ )+ .unwrap_or_else(|error| panic!("database {database}: {error}"));+}++#[test]+fn database_readiness_waits_for_every_vgroup() {+ let mut calls = 0;+ wait_for_database_ready(+ || {+ calls += 1;+ json!({"columns": ["vgid", "is_ready"], "rows": [[2, true], [3, calls > 1]]})+ },+ Duration::from_secs(1),+ )+ .unwrap();+ assert_eq!(calls, 2);+}++#[test]+fn database_readiness_rejects_empty_or_offline_vgroups() {+ for rows in [json!([]), json!([[2, false]])] {+ let error = wait_for_database_ready(|| json!({"columns": ["vgid", "is_ready"], "rows": rows}), Duration::ZERO)+ .unwrap_err();+ assert!(error.contains("VGroups did not become ready"), "{error}");+ }+}++#[test]+fn database_readiness_preserves_older_server_support() {+ wait_for_database_ready(|| json!({"columns": ["vgid", "v1_status"], "rows": [[2, "leader"]]}), Duration::ZERO)+ .unwrap();+}+#[test]fn tdengine_websocket_live_compatibility() {let Some(connect_params) = integration_params() else {@@ -83,12 +156,12 @@ fn tdengine_websocket_live_compatibility() {open_params["agentSessionId"] = json!(session_id);assert_eq!(agent.call("open_session", open_params), json!({"ok": true}));+ create_database(&mut agent, session_id, &database);agent.call("execute_batch",json!({"agentSessionId": session_id,"statements": [- format!("CREATE DATABASE IF NOT EXISTS {database}"),format!("CREATE STABLE IF NOT EXISTS {database}.meters (ts TIMESTAMP, current FLOAT, voltage INT, active BOOL, note NCHAR(32)) TAGS (location NCHAR(64), group_id INT)"),format!("CREATE TABLE IF NOT EXISTS {database}.d1001 USING {database}.meters TAGS ('California.SanFrancisco', 2)"),format!("INSERT INTO {database}.d1001 VALUES (1785808800001, 10.1, 220, true, 'first') (1785808800002, 10.2, 221, false, 'second') (1785808800003, 10.3, 222, true, 'third')")@@ -242,10 +315,9 @@ fn tdengine_websocket_live_paged_table_list_matches_the_full_list() {open_params["agentSessionId"] = json!(session_id);assert_eq!(agent.call("open_session", open_params), json!({"ok": true}));- let mut statements = vec![- format!("CREATE DATABASE IF NOT EXISTS {database}"),- format!("CREATE STABLE IF NOT EXISTS {database}.st_paged (ts TIMESTAMP, v INT) TAGS (gid INT)"),- ];+ create_database(&mut agent, session_id, &database);+ let mut statements =+ vec![format!("CREATE STABLE IF NOT EXISTS {database}.st_paged (ts TIMESTAMP, v INT) TAGS (gid INT)")];// Enough child tables that the sidebar's paging walks several pages.for index in 0..300 {statements.push(format!(@@ -274,7 +346,10 @@ fn tdengine_websocket_live_paged_table_list_matches_the_full_list() {.expect("table list").iter().map(|table| {- (table["name"].as_str().unwrap_or_default().to_string(), table["table_type"].as_str().unwrap_or_default().to_string())+ (+ table["name"].as_str().unwrap_or_default().to_string(),+ table["table_type"].as_str().unwrap_or_default().to_string(),+ )}).collect()}@@ -300,6 +375,9 @@ fn tdengine_websocket_live_paged_table_list_matches_the_full_list() {}assert_eq!(seen, full, "paging dropped or invented tables");- agent.call("execute_batch", json!({"agentSessionId": session_id, "statements": [format!("DROP DATABASE IF EXISTS {database}")]}));+ agent.call(+ "execute_batch",+ json!({"agentSessionId": session_id, "statements": [format!("DROP DATABASE IF EXISTS {database}")]}),+ );agent.shutdown();}diff --git a/crates/dbx-driver-postgres/Cargo.toml b/crates/dbx-driver-postgres/Cargo.tomlindex 01e9ed8195..a2acca37a9 100644--- a/crates/dbx-driver-postgres/Cargo.toml+++ b/crates/dbx-driver-postgres/Cargo.toml@@ -30,6 +30,5 @@ uuid = { version = "1", features = ["v4", "serde"] }webpki-roots = "0.26"[dev-dependencies]-portpicker = "0.1.1"tempfile = "3"tokio-openssl = "0.6"diff --git a/crates/dbx-driver-postgres/src/postgres.rs b/crates/dbx-driver-postgres/src/postgres.rsindex 0c8f485e16..b4e1b0fec7 100644--- a/crates/dbx-driver-postgres/src/postgres.rs+++ b/crates/dbx-driver-postgres/src/postgres.rs@@ -12629,8 +12629,7 @@ mod tests {return None;}- let port = portpicker::pick_unused_port().expect("pick unused postgres port");- let container = DockerPostgres { name: format!("dbx-postgres-enum-{}", uuid::Uuid::new_v4()), port };+ let mut container = DockerPostgres { name: format!("dbx-postgres-enum-{}", uuid::Uuid::new_v4()), port: 0 };let status = Command::new("docker").args(["run", "-d", "--rm", "--name", &container.name])@@ -12643,7 +12642,7 @@ mod tests {"-e","POSTGRES_DB=postgres","-p",- &format!("{port}:5432"),+ "127.0.0.1::5432",image,]).args(postgres_args)@@ -12651,6 +12650,22 @@ mod tests {.expect("start docker postgres");assert!(status.success(), "docker run postgres container should succeed");+ let binding = Command::new("docker")+ .args([+ "inspect",+ "--format",+ "{{(index (index .NetworkSettings.Ports \"5432/tcp\") 0).HostPort}}",+ &container.name,+ ])+ .output()+ .expect("inspect docker postgres port");+ assert!(binding.status.success(), "docker inspect postgres port should succeed");+ container.port = String::from_utf8(binding.stdout)+ .expect("docker postgres port is UTF-8")+ .trim()+ .parse()+ .expect("docker postgres port is a u16");+let deadline = Instant::now() + Duration::from_secs(60);loop {match connect(&container.url(), Duration::from_secs(2)).await {diff --git a/crates/dbx-drivers/src/salesforce_oauth.rs b/crates/dbx-drivers/src/salesforce_oauth.rsindex afebd14e91..3e134200e2 100644--- a/crates/dbx-drivers/src/salesforce_oauth.rs+++ b/crates/dbx-drivers/src/salesforce_oauth.rs@@ -423,13 +423,14 @@ fn client_secret_pair(params: &SfOauthParams) -> Option<String> {/// one browser flow may run at a time (shared lock with nothing else — Mongo/// OIDC keeps its own).pub async fn authorize_with_browser(params: &SfOauthParams, opener: &SfBrowserOpener) -> Result<SfTokenSet, String> {- authorize_with_browser_policy(params, opener, EndpointPolicy::HttpsOnly).await+ authorize_with_browser_policy(params, opener, EndpointPolicy::HttpsOnly, None).await}async fn authorize_with_browser_policy(params: &SfOauthParams,opener: &SfBrowserOpener,policy: EndpointPolicy,+ callback_listener: Option<TcpListener>,) -> Result<SfTokenSet, String> {let deadline = Instant::now() + SALESFORCE_OAUTH_BROWSER_TIMEOUT;let remaining = || {@@ -443,9 +444,12 @@ async fn authorize_with_browser_policy(let _flow_guard = tokio::time::timeout(remaining()?, browser_flow_lock().lock()).await.map_err(|_| oauth_error("browser authorization timed out"))?;- let listener = TcpListener::bind(OAUTH_CALLBACK_ADDRESS)- .await- .map_err(|err| oauth_error(format!("cannot listen on {SALESFORCE_OAUTH_REDIRECT_URI}: {err}")))?;+ let listener = match callback_listener {+ Some(listener) => listener,+ None => TcpListener::bind(OAUTH_CALLBACK_ADDRESS)+ .await+ .map_err(|err| oauth_error(format!("cannot listen on {SALESFORCE_OAUTH_REDIRECT_URI}: {err}")))?,+ };let state = random_url_safe_value();let verifier = random_url_safe_value();@@ -864,6 +868,8 @@ mod tests {#[tokio::test]async fn browser_flow_exchanges_pkce_code_for_tokens() {+ let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();+ let callback_address = listener.local_addr().unwrap();let (base, requests, server) = start_mock_oauth_server(Vec::new()).await;let opened = Arc::new(StdMutex::new(None));let captured = opened.clone();@@ -872,7 +878,7 @@ mod tests {let state = parsed.query_pairs().find_map(|(k, v)| (k == "state").then(|| v.into_owned())).unwrap();*captured.lock().unwrap() = Some(parsed);std::thread::spawn(move || {- let mut stream = std::net::TcpStream::connect("127.0.0.1:27098").unwrap();+ let mut stream = std::net::TcpStream::connect(callback_address).unwrap();write!(stream, "GET /callback?code=auth-code&state={state}").unwrap();std::thread::sleep(Duration::from_millis(10));write!(stream, " HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n").unwrap();@@ -884,7 +890,9 @@ mod tests {});let tokens =- authorize_with_browser_policy(¶ms(&base), &opener, EndpointPolicy::AllowLoopbackHttp).await.unwrap();+ authorize_with_browser_policy(¶ms(&base), &opener, EndpointPolicy::AllowLoopbackHttp, Some(listener))+ .await+ .unwrap();server.abort();assert_eq!(tokens.access_token, "token");@@ -896,17 +904,20 @@ mod tests {assert!(recorded[0].contains("grant_type=authorization_code"));assert!(recorded[0].contains("code=auth-code"));assert!(recorded[0].contains("code_verifier="));+ assert!(recorded[0].contains("redirect_uri=http%3A%2F%2Flocalhost%3A27098%2Fcallback"));assert!(!recorded[0].contains("client_secret"));}#[tokio::test]async fn confidential_app_sends_client_secret() {+ let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();+ let callback_address = listener.local_addr().unwrap();let (base, requests, server) = start_mock_oauth_server(Vec::new()).await;let opener: SfBrowserOpener = Arc::new(move |url| {let parsed = Url::parse(url).unwrap();let state = parsed.query_pairs().find_map(|(k, v)| (k == "state").then(|| v.into_owned())).unwrap();std::thread::spawn(move || {- let mut stream = std::net::TcpStream::connect("127.0.0.1:27098").unwrap();+ let mut stream = std::net::TcpStream::connect(callback_address).unwrap();write!(stream,"GET /callback?code=c&state={state} HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n"@@ -919,7 +930,10 @@ mod tests {});let mut confidential = params(&base);confidential.client_secret = Some("app-secret".to_string());- let _ = authorize_with_browser_policy(&confidential, &opener, EndpointPolicy::AllowLoopbackHttp).await.unwrap();+ let _ =+ authorize_with_browser_policy(&confidential, &opener, EndpointPolicy::AllowLoopbackHttp, Some(listener))+ .await+ .unwrap();server.abort();assert!(requests.lock().unwrap()[0].contains("client_secret=app-secret"));}