fix(oracle): apply visible schema filter

This commit is contained in:
t8y2 committed 2026-06-25 15:19:20 +08:00
1 parent 1ded7e8332
commit b2edf7cad6
20 files changed
+469 -102

No files matched your search

@@ -24,6 +24,7 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -107,19 +108,7 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
public List<DatabaseInfo> listDatabases() {
return unchecked(() -> {
List<DatabaseInfo> result = new ArrayList<>();
String placeholders = quotedSystemSchemas();
String sql = "SELECT owner FROM ("
+ " SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') AS owner FROM DUAL"
+ " UNION"
+ " SELECT DISTINCT owner FROM all_tables"
+ " UNION"
+ " SELECT DISTINCT owner FROM all_views"
+ " )"
+ " WHERE owner IS NOT NULL"
+ " AND owner NOT IN (" + placeholders + ")"
+ " AND owner NOT LIKE 'APEX_%'"
+ " AND owner NOT LIKE 'FLOWS_%'"
+ " ORDER BY owner";
String sql = listDatabasesSql(0);
try (Statement stmt = requireConnected().createStatement();
ResultSet rs = stmt.executeQuery(sql)) {
while (rs.next()) {
@@ -130,6 +119,31 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
});
}
static String listDatabasesSql(int visibleSchemaCount) {
StringBuilder sql = new StringBuilder()
.append("SELECT owner FROM (")
.append(" SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') AS owner FROM DUAL")
.append(" UNION")
.append(" SELECT DISTINCT owner FROM all_tables")
.append(" UNION")
.append(" SELECT DISTINCT owner FROM all_views")
.append(" )")
.append(" WHERE owner IS NOT NULL")
.append(" AND owner NOT IN (").append(quotedSystemSchemas()).append(")")
.append(" AND owner NOT LIKE 'APEX_%'")
.append(" AND owner NOT LIKE 'FLOWS_%'");
if (visibleSchemaCount > 0) {
sql.append(" AND owner IN (");
for (int i = 0; i < visibleSchemaCount; i++) {
if (i > 0) sql.append(",");
sql.append("?");
}
sql.append(")");
}
sql.append(" ORDER BY owner");
return sql.toString();
}
@Override
public List<String> listSchemas() {
return unchecked(() -> {
@@ -141,6 +155,30 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
});
}
@Override
public List<String> listSchemas(List<String> visibleSchemas) {
if (visibleSchemas == null) {
return listSchemas();
}
if (visibleSchemas.isEmpty()) {
return Collections.emptyList();
}
return unchecked(() -> {
List<String> result = new ArrayList<>();
try (PreparedStatement stmt = requireConnected().prepareStatement(listDatabasesSql(visibleSchemas.size()))) {
for (int i = 0; i < visibleSchemas.size(); i++) {
stmt.setString(i + 1, visibleSchemas.get(i));
}
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
result.add(rs.getString(1));
}
}
}
return result;
});
}
@Override
public List<TableInfo> listTables(String schema) {
return unchecked(() -> {
@@ -100,6 +100,15 @@ class Oracle10gAgentTest extends JdbcFakeExecutionBehaviorTest {
Assertions.assertFalse(sql.contains("ALL_TAB_COMMENTS"), sql);
}
@Test
void listDatabasesSqlCanApplyVisibleSchemaFilter() {
String sql = Oracle10gAgent.listDatabasesSql(2).toUpperCase(Locale.ROOT);
Assertions.assertTrue(sql.contains("ALL_TABLES"), sql);
Assertions.assertTrue(sql.contains("ALL_VIEWS"), sql);
Assertions.assertTrue(sql.contains("OWNER IN (?,?)"), sql);
}
@Test
void listObjectsSqlUsesSplitDictionaryQuery() {
String sql = Oracle10gAgent.listObjectsSql().toUpperCase(Locale.ROOT);