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
fix(postgres): align notice buffer typing with the streaming refactor
t8y2a7090cea7e91
diff --git a/crates/dbx-driver-postgres/src/postgres.rs b/crates/dbx-driver-postgres/src/postgres.rsindex 827d2251a4..0c6cb1653f 100644--- a/crates/dbx-driver-postgres/src/postgres.rs+++ b/crates/dbx-driver-postgres/src/postgres.rs@@ -2764,8 +2764,8 @@ fn postgres_connection_key_from_row(row: &tokio_postgres::Row) -> Option<Postgretype PostgresNoticeBuffers = HashMap<PostgresConnectionKey, Weak<Mutex<PostgresNoticeBuffer>>>;#[derive(Default)]-struct PostgresNoticeBuffer {- messages: dbx_driver_support::query_messages::QueryMessageBuffer,+pub(crate) struct PostgresNoticeBuffer {+ pub(crate) messages: dbx_driver_support::query_messages::QueryMessageBuffer,sink: Option<dbx_driver_support::query_messages::QueryMessageSink>,}@@ -2777,7 +2777,7 @@ impl Drop for PostgresNoticeSubscription {}}-fn capture_postgres_notice(buffer: &Mutex<PostgresNoticeBuffer>, message: QueryMessage) {+pub(crate) fn capture_postgres_notice(buffer: &Mutex<PostgresNoticeBuffer>, message: QueryMessage) {let mut buffer = buffer.lock().unwrap_or_else(|error| error.into_inner());if let (Some(message), Some(sink)) = (buffer.messages.push(message), buffer.sink.as_ref()) {sink(message);@@ -3068,7 +3068,7 @@ async fn postgres_client_key(client: &deadpool_postgres::Client) -> Option<Postgpub(crate) fn postgres_query_message_buffer(client: &deadpool_postgres::Client,-) -> Option<Arc<Mutex<Vec<QueryMessage>>>> {+) -> Option<Arc<Mutex<PostgresNoticeBuffer>>> {let key = cached_postgres_client_key(client)??;postgres_notice_buffers().lock().unwrap_or_else(|e| e.into_inner()).get(&key).and_then(Weak::upgrade)}diff --git a/crates/dbx-driver-postgres/src/text_encoding.rs b/crates/dbx-driver-postgres/src/text_encoding.rsindex 8b9808d325..b293e5692f 100644--- a/crates/dbx-driver-postgres/src/text_encoding.rs+++ b/crates/dbx-driver-postgres/src/text_encoding.rs@@ -566,18 +566,17 @@ impl Statement for tokio_postgres::Statement {}}-type WarningBuffer = Arc<Mutex<Vec<crate::types::QueryMessage>>>;+type WarningBuffer = Arc<Mutex<crate::postgres::PostgresNoticeBuffer>>;const FALLBACK_WARNING_CODE: &str = "DBX_PG_TEXT_ENCODING_FALLBACK";fn report_encoding_fallback(buffer: Option<&WarningBuffer>, encoding: Option<TextEncoding>) {let (Some(buffer), Some(encoding)) = (buffer, encoding) else {return;};- let mut messages = buffer.lock().unwrap_or_else(|e| e.into_inner());- if messages.iter().any(|m| m.code.as_deref() == Some(FALLBACK_WARNING_CODE)) {+ if buffer.lock().unwrap_or_else(|e| e.into_inner()).messages.contains_code(FALLBACK_WARNING_CODE) {return;}- messages.push(crate::types::QueryMessage {+ crate::postgres::capture_postgres_notice(buffer, crate::types::QueryMessage {severity: "WARNING".into(),code: Some(FALLBACK_WARNING_CODE.into()),message: format!("Some text could not be decoded as {}; original text was retained without conversion.", encoding.0.name()),diff --git a/crates/dbx-driver-support/src/query_messages.rs b/crates/dbx-driver-support/src/query_messages.rsindex 6f2104041c..af68e6d149 100644--- a/crates/dbx-driver-support/src/query_messages.rs+++ b/crates/dbx-driver-support/src/query_messages.rs@@ -59,6 +59,10 @@ impl QueryMessageBuffer {std::mem::take(&mut self.messages)}+ pub fn contains_code(&self, code: &str) -> bool {+ self.messages.iter().any(|message| message.code.as_deref() == Some(code))+ }+pub fn take(&mut self) -> Vec<QueryMessage> {let messages = self.drain();*self = Self::default();