Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

perf(postgres): build row column names only for encoded connections

t8y22a09c1c2b23d
diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs
index f53a14e37f..f272ec5102 100644
--- a/crates/dbx-core/src/data/transfer.rs
+++ b/crates/dbx-core/src/data/transfer.rs
@@ -7584,7 +7584,10 @@ async fn get_postgres_owned_sequences_for_transfer(
_ => return Ok(Vec::new()),
}
};
- let client = pool.get().await.map_err(|e| e.to_string())?;
+ let pool_client = pool.get().await.map_err(|e| e.to_string())?;
+ // Route through the encoding-aware client so legacy-encoded sources return
+ // decoded sequence/owner names (raw pool clients bypass text decoding).
+ let client = db::postgres::text_encoding::Client::new(&pool_client);
let rows = client.query(POSTGRES_OWNED_SEQUENCES_SQL, &[&schema]).await.map_err(|e| e.to_string())?;
let selected: HashSet<&str> = tables.iter().map(String::as_str).collect();
@@ -7650,7 +7653,9 @@ async fn get_postgres_sequence_snapshots_for_transfer(
_ => return Ok(Vec::new()),
}
};
- let client = pool.get().await.map_err(|e| e.to_string())?;
+ let pool_client = pool.get().await.map_err(|e| e.to_string())?;
+ // Same encoding-aware wrapper as the owned-sequence listing above.
+ let client = db::postgres::text_encoding::Client::new(&pool_client);
let rows = client.query(POSTGRES_SEQUENCE_SNAPSHOTS_SQL, &[&schema]).await.map_err(|e| e.to_string())?;
Ok(rows
diff --git a/crates/dbx-driver-postgres/src/lib.rs b/crates/dbx-driver-postgres/src/lib.rs
index a9ee5f7e8a..763938a79c 100644
--- a/crates/dbx-driver-postgres/src/lib.rs
+++ b/crates/dbx-driver-postgres/src/lib.rs
@@ -6,7 +6,7 @@ pub use dbx_sql_core::{sql, sql_error_position};
pub use dbx_types::{models, types};
mod postgres;
-mod text_encoding;
+pub mod text_encoding;
pub use postgres::*;
diff --git a/crates/dbx-driver-postgres/src/text_encoding.rs b/crates/dbx-driver-postgres/src/text_encoding.rs
index 1b19445a7d..abad29758b 100644
--- a/crates/dbx-driver-postgres/src/text_encoding.rs
+++ b/crates/dbx-driver-postgres/src/text_encoding.rs
@@ -382,36 +382,34 @@ impl<'a> FromSql<'a> for Raw {
#[derive(Debug)]
pub struct Row {
original: tokio_postgres::Row,
- names: Vec<String>,
+ // Decoded column names exist only for connections with a configured text
+ // encoding; without one the original names are already correct and a
+ // per-row Vec<String> would tax every result row of every ordinary query.
+ names: Option<Vec<String>>,
values: Option<Vec<Option<Vec<u8>>>>,
}
impl Row {
pub(crate) fn new(original: tokio_postgres::Row, encoding: Option<TextEncoding>) -> Result<Self, PgError> {
- let names = original
- .columns()
- .iter()
- .map(|c| match encoding {
- Some(e) => e.decode(c.name()),
- None => Ok(c.name().into()),
- })
- .collect::<Result<_, _>>()?;
- let values = if let Some(e) = encoding {
- Some(
- original
- .columns()
- .iter()
- .enumerate()
- .map(|(i, c)| {
- if !e.transforms(c.type_()) {
- return Ok(None);
- }
- let value: Option<Raw> = original.try_get(i)?;
- value.map(|raw| e.transform(c.type_(), &raw.0, false)).transpose().map_err(PgError::from)
- })
- .collect::<Result<_, PgError>>()?,
- )
- } else {
- None
+ let (names, values) = match encoding {
+ None => (None, None),
+ Some(e) => {
+ let names = original.columns().iter().map(|c| e.decode(c.name())).collect::<Result<_, _>>()?;
+ let values = Some(
+ original
+ .columns()
+ .iter()
+ .enumerate()
+ .map(|(i, c)| {
+ if !e.transforms(c.type_()) {
+ return Ok(None);
+ }
+ let value: Option<Raw> = original.try_get(i)?;
+ value.map(|raw| e.transform(c.type_(), &raw.0, false)).transpose().map_err(PgError::from)
+ })
+ .collect::<Result<_, PgError>>()?,
+ );
+ (Some(names), values)
+ }
};
Ok(Self { original, names, values })
}
@@ -432,7 +430,11 @@ impl Row {
I: tokio_postgres::row::RowIndex + fmt::Display,
T: FromSql<'a>,
{
- let Some(i) = idx.__idx(&self.names) else {
+ let resolved = match self.names.as_deref() {
+ Some(names) => idx.__idx(names),
+ None => idx.__idx(self.original.columns()),
+ };
+ let Some(i) = resolved else {
return Err(PgError::Encoding(format!("Unknown PostgreSQL column {idx}")));
};
let Some(values) = &self.values else {