From 14ce7a229e8ea1b1948cf03ab5e45b01eb6dcd80 Mon Sep 17 00:00:00 2001 From: zipg Date: Wed, 15 Jul 2026 19:28:44 +0800 Subject: [PATCH] fix(kingbase): filter non-connectable databases --- .../com/dbx/agent/kingbase/KingbaseAgent.java | 16 ++++--- .../dbx/agent/kingbase/KingbaseAgentTest.java | 42 ++++++++++++++++--- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/agents/drivers/kingbase/src/main/java/com/dbx/agent/kingbase/KingbaseAgent.java b/agents/drivers/kingbase/src/main/java/com/dbx/agent/kingbase/KingbaseAgent.java index ec0c011cd..5e6c22d0b 100644 --- a/agents/drivers/kingbase/src/main/java/com/dbx/agent/kingbase/KingbaseAgent.java +++ b/agents/drivers/kingbase/src/main/java/com/dbx/agent/kingbase/KingbaseAgent.java @@ -100,13 +100,9 @@ public final class KingbaseAgent extends PostgresLikeAgent { public List listDatabases() { if (postgresCatalogMode) return super.listDatabases(); return unchecked(() -> { - if (isMysqlCompatMode()) { - List result = queryDatabases("SELECT current_database() AS database_name"); - if (!result.isEmpty()) return result; - } for (String sql : List.of( - "SELECT datname AS database_name FROM sys_catalog.sys_database WHERE datistemplate = false ORDER BY datname", - "SELECT datname AS database_name FROM pg_database WHERE datistemplate = false ORDER BY datname" + "SELECT datname AS database_name FROM sys_catalog.sys_database WHERE datistemplate = false AND datallowconn = true ORDER BY datname", + "SELECT datname AS database_name FROM pg_database WHERE datistemplate = false AND datallowconn = true ORDER BY datname" )) { try { List result = queryDatabases(sql); @@ -115,6 +111,14 @@ public final class KingbaseAgent extends PostgresLikeAgent { // Kingbase catalog names differ across compatibility modes and versions. } } + if (isMysqlCompatMode()) { + try { + List result = queryDatabases("SELECT current_database() AS database_name"); + if (!result.isEmpty()) return result; + } catch (Exception ignored) { + // Keep the configured database as the final fallback if current_database() is unavailable. + } + } return Collections.singletonList(new DatabaseInfo(getConfiguredDatabase())); }); } diff --git a/agents/drivers/kingbase/src/test/java/com/dbx/agent/kingbase/KingbaseAgentTest.java b/agents/drivers/kingbase/src/test/java/com/dbx/agent/kingbase/KingbaseAgentTest.java index 2e2f57465..c390d4222 100644 --- a/agents/drivers/kingbase/src/test/java/com/dbx/agent/kingbase/KingbaseAgentTest.java +++ b/agents/drivers/kingbase/src/test/java/com/dbx/agent/kingbase/KingbaseAgentTest.java @@ -59,17 +59,41 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest { } @Test - void mysqlCompatListDatabasesUsesCurrentDatabase() { + void mysqlCompatListDatabasesUsesKingbaseCatalog() { List sql = new ArrayList<>(); KingbaseAgent agent = new KingbaseAgent(); agent.setMysqlCompatMode(true); TestSupport.setPrivateConnection(agent, preparedConnection(sql, resultSet( new String[]{"database_name"}, - new Object[][]{{"TEST"}} + new Object[][]{{"app"}, {"analytics"}} ))); + List databases = agent.listDatabases(); + + Assertions.assertEquals(2, databases.size()); + Assertions.assertEquals("app", databases.get(0).getName()); + Assertions.assertEquals("analytics", databases.get(1).getName()); + Assertions.assertTrue(sql.get(0).contains("FROM sys_catalog.sys_database"), sql.get(0)); + Assertions.assertTrue(sql.get(0).contains("datallowconn = true"), sql.get(0)); + } + + @Test + void mysqlCompatListDatabasesFallsBackToCurrentDatabase() { + List sql = new ArrayList<>(); + KingbaseAgent agent = new KingbaseAgent(); + agent.setMysqlCompatMode(true); + TestSupport.setPrivateConnection(agent, preparedConnectionWithFailures( + sql, + List.of("sys_catalog.sys_database", "FROM pg_database"), + resultSet(new String[]{"database_name"}, new Object[][]{{"TEST"}}) + )); + Assertions.assertEquals("TEST", agent.listDatabases().get(0).getName()); - Assertions.assertEquals("SELECT current_database() AS database_name", sql.get(0)); + Assertions.assertTrue(sql.get(0).contains("FROM sys_catalog.sys_database"), sql.get(0)); + Assertions.assertTrue(sql.get(0).contains("datallowconn = true"), sql.get(0)); + Assertions.assertTrue(sql.get(1).contains("FROM pg_database"), sql.get(1)); + Assertions.assertTrue(sql.get(1).contains("datallowconn = true"), sql.get(1)); + Assertions.assertEquals("SELECT current_database() AS database_name", sql.get(2)); } @Test @@ -86,6 +110,7 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest { Assertions.assertEquals("app", databases.get(0).getName()); Assertions.assertEquals("analytics", databases.get(1).getName()); Assertions.assertTrue(sql.get(0).contains("FROM sys_catalog.sys_database"), sql.get(0)); + Assertions.assertTrue(sql.get(0).contains("datallowconn = true"), sql.get(0)); } @Test @@ -103,6 +128,7 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest { Assertions.assertEquals("test", databases.get(0).getName()); Assertions.assertTrue(sql.get(0).contains("FROM sys_catalog.sys_database"), sql.get(0)); Assertions.assertTrue(sql.get(1).contains("FROM pg_database"), sql.get(1)); + Assertions.assertTrue(sql.get(1).contains("datallowconn = true"), sql.get(1)); } @Test @@ -602,14 +628,20 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest { } private static Connection preparedConnectionWithFailure(List sql, String failingSqlFragment, ResultSet fallback) { + return preparedConnectionWithFailures(sql, List.of(failingSqlFragment), fallback); + } + + private static Connection preparedConnectionWithFailures(List sql, List failingSqlFragments, ResultSet fallback) { return proxy(Connection.class, (method, args) -> { if ("prepareStatement".equals(method.getName())) { String preparedSql = String.valueOf(args[0]); sql.add(preparedSql); return proxy(PreparedStatement.class, (statementMethod, statementArgs) -> { if ("executeQuery".equals(statementMethod.getName())) { - if (preparedSql.contains(failingSqlFragment)) { - throw new SQLException("relation does not exist: " + failingSqlFragment); + for (String failingSqlFragment : failingSqlFragments) { + if (preparedSql.contains(failingSqlFragment)) { + throw new SQLException("relation does not exist: " + failingSqlFragment); + } } return fallback; }