fix(kingbase): filter non-connectable databases

This commit is contained in:
zipg
2026-07-15 19:28:44 +08:00
committed by GitHub
parent a62f2dde55
commit 14ce7a229e
2 changed files with 47 additions and 11 deletions
@@ -100,13 +100,9 @@ public final class KingbaseAgent extends PostgresLikeAgent {
public List<DatabaseInfo> listDatabases() {
if (postgresCatalogMode) return super.listDatabases();
return unchecked(() -> {
if (isMysqlCompatMode()) {
List<DatabaseInfo> 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<DatabaseInfo> 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<DatabaseInfo> 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()));
});
}
@@ -59,17 +59,41 @@ class KingbaseAgentTest extends JdbcFakeExecutionBehaviorTest {
}
@Test
void mysqlCompatListDatabasesUsesCurrentDatabase() {
void mysqlCompatListDatabasesUsesKingbaseCatalog() {
List<String> 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<DatabaseInfo> 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<String> 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<String> sql, String failingSqlFragment, ResultSet fallback) {
return preparedConnectionWithFailures(sql, List.of(failingSqlFragment), fallback);
}
private static Connection preparedConnectionWithFailures(List<String> sql, List<String> 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;
}