fix(schema): list HighGo PostgreSQL extensions

Closes #7448
This commit is contained in:
t8y2 committed 2026-08-28 05:02:43 +00:00
1 parent fdfad88590
commit 89086cc22b
1 file changed
+31
+31
View File
@@ -3040,6 +3040,7 @@ fn escape_presto_like_pattern(value: &str) -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::agent_postgres_extension_fallback_config;
use super::db; use super::db;
use super::{ use super::{
clickhouse_metadata_database, dameng_object_statistics_dba_segments_sql, clickhouse_metadata_database, dameng_object_statistics_dba_segments_sql,
@@ -4710,6 +4711,17 @@ for line in sys.stdin:
assert!(!is_agent_postgres_metadata_fallback_config(&test_connection_config(DatabaseType::Mysql))); assert!(!is_agent_postgres_metadata_fallback_config(&test_connection_config(DatabaseType::Mysql)));
} }
#[test]
fn postgres_extension_metadata_fallback_targets_pg_compatible_agents() {
for db_type in [DatabaseType::Highgo, DatabaseType::Vastbase] {
assert!(agent_postgres_extension_fallback_config(Some(&test_connection_config(db_type))).is_some());
}
for db_type in [DatabaseType::Kingbase, DatabaseType::Uxdb, DatabaseType::Postgres, DatabaseType::Mysql] {
assert!(agent_postgres_extension_fallback_config(Some(&test_connection_config(db_type))).is_none());
}
assert!(agent_postgres_extension_fallback_config(None).is_none());
}
#[test] #[test]
fn agent_metadata_timeout_defaults_to_sixty_seconds_and_honors_longer_config() { fn agent_metadata_timeout_defaults_to_sixty_seconds_and_honors_longer_config() {
assert_eq!(super::agent_metadata_timeout(None), Some(std::time::Duration::from_secs(60))); assert_eq!(super::agent_metadata_timeout(None), Some(std::time::Duration::from_secs(60)));
@@ -6141,6 +6153,10 @@ fn is_agent_postgres_metadata_fallback_config(config: &ConnectionConfig) -> bool
matches!(config.db_type, DatabaseType::Highgo | DatabaseType::Vastbase) matches!(config.db_type, DatabaseType::Highgo | DatabaseType::Vastbase)
} }
fn agent_postgres_extension_fallback_config(config: Option<&ConnectionConfig>) -> Option<&ConnectionConfig> {
config.filter(|config| is_agent_postgres_metadata_fallback_config(config))
}
async fn native_postgres_metadata_pool( async fn native_postgres_metadata_pool(
state: &AppState, state: &AppState,
connection_id: &str, connection_id: &str,
@@ -7292,6 +7308,15 @@ pub async fn list_extensions_core(
} }
} }
// HighGo and Vastbase use Agent pools but expose PostgreSQL's extension
// catalogs. Reuse the native metadata fallback so their installed
// extensions are not silently reported as an empty list.
if let Some(config) = agent_postgres_extension_fallback_config(db_config.as_ref()) {
if let Some(pool) = native_postgres_metadata_pool(state, connection_id, database, config).await? {
return db::postgres::list_extensions(&pool, schema).await;
}
}
let pool = clone_metadata_pool(state, &pool_key).await.ok_or("Pool not found")?; let pool = clone_metadata_pool(state, &pool_key).await.ok_or("Pool not found")?;
match &pool { match &pool {
@@ -7323,6 +7348,12 @@ pub async fn list_available_extensions_core(
} }
} }
if let Some(config) = agent_postgres_extension_fallback_config(db_config.as_ref()) {
if let Some(pool) = native_postgres_metadata_pool(state, connection_id, database, config).await? {
return db::postgres::list_available_extensions(&pool).await;
}
}
let pool = clone_metadata_pool(state, &pool_key).await.ok_or("Pool not found")?; let pool = clone_metadata_pool(state, &pool_key).await.ok_or("Pool not found")?;
match &pool { match &pool {