diff --git a/crates/dbx-core/src/db/postgres.rs b/crates/dbx-core/src/db/postgres.rs index 696a6fa86..e965470c6 100644 --- a/crates/dbx-core/src/db/postgres.rs +++ b/crates/dbx-core/src/db/postgres.rs @@ -1652,17 +1652,30 @@ async fn postgres_proc_has_prokind(client: &deadpool_postgres::Client) -> Result Ok(row.get(0)) } +async fn list_objects_rows( + client: &deadpool_postgres::Client, + schema: &str, + include_timestamps: bool, + has_proc_prokind: bool, +) -> Result, String> { + let sql = list_objects_sql(include_timestamps, has_proc_prokind); + let stmt = client.prepare_cached(&sql).await.map_err(|e| e.to_string())?; + client.query(&stmt, &[&schema]).await.map_err(|e| e.to_string()) +} + pub async fn list_objects(pool: &Pool, schema: &str) -> Result, String> { let client = checkout_postgres_client(pool, None, super::connection_timeout()).await?; let has_proc_prokind = postgres_proc_has_prokind(&client).await?; - let sql = list_objects_sql(true, has_proc_prokind); - let stmt = client.prepare_cached(&sql).await.map_err(|e| e.to_string())?; - let rows = match client.query(&stmt, &[&schema]).await { + let rows = match list_objects_rows(&client, schema, true, has_proc_prokind).await { Ok(rows) => rows, - Err(_) => { - let fallback_sql = list_objects_sql(false, has_proc_prokind); - let stmt = client.prepare_cached(&fallback_sql).await.map_err(|e| e.to_string())?; - client.query(&stmt, &[&schema]).await.map_err(|e| e.to_string())? + Err(primary_error) => { + log::debug!("[postgres][list_objects:timestamp-fallback] primary_error={}", primary_error); + match list_objects_rows(&client, schema, false, has_proc_prokind).await { + Ok(rows) => rows, + Err(fallback_error) => { + return Err(format!("{primary_error}; timestamp fallback failed: {fallback_error}")); + } + } } };