fix(oracle): apply visible schema filter
This commit is contained in:
1 parent
1ded7e8332
commit
b2edf7cad6
20 files changed
+469
-102
No files matched your search
@@ -140,9 +140,14 @@ public class OracleAgent extends BaseDatabaseAgent {
|
||||
}
|
||||
|
||||
static String listDatabasesSql() {
|
||||
return listDatabasesSql(0);
|
||||
}
|
||||
|
||||
static String listDatabasesSql(int visibleSchemaCount) {
|
||||
String placeholders = SYSTEM_SCHEMAS.stream()
|
||||
.map(schema -> "'" + schema + "'")
|
||||
.collect(Collectors.joining(","));
|
||||
String visibleSchemaClause = visibleSchemaCount <= 0 ? "" : " AND username IN (" + "?,".repeat(visibleSchemaCount).replaceAll(",$", "") + ")\n";
|
||||
return """
|
||||
SELECT username AS owner
|
||||
FROM all_users
|
||||
@@ -151,12 +156,13 @@ public class OracleAgent extends BaseDatabaseAgent {
|
||||
AND username NOT LIKE 'APEX_%%'
|
||||
AND username NOT LIKE 'FLOWS_%%'
|
||||
AND username NOT LIKE '%%$%%'
|
||||
%s
|
||||
ORDER BY CASE
|
||||
WHEN username = SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') THEN 0
|
||||
WHEN username = SYS_CONTEXT('USERENV', 'SESSION_USER') THEN 1
|
||||
ELSE 2
|
||||
END, username
|
||||
""".formatted(placeholders).stripIndent().trim();
|
||||
""".formatted(placeholders, visibleSchemaClause).stripIndent().trim();
|
||||
}
|
||||
|
||||
static boolean isPgaLimitError(SQLException error) {
|
||||
@@ -212,6 +218,30 @@ public class OracleAgent extends BaseDatabaseAgent {
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> listSchemas(List<String> visibleSchemas) {
|
||||
if (visibleSchemas == null) {
|
||||
return listSchemas();
|
||||
}
|
||||
if (visibleSchemas.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
return unchecked(() -> {
|
||||
List<String> result = new ArrayList<>();
|
||||
try (var 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(() -> {
|
||||
|
||||
@@ -7,6 +7,7 @@ import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
class OracleAgentTest extends JdbcFakeExecutionBehaviorTest {
|
||||
@@ -65,6 +66,22 @@ class OracleAgentTest extends JdbcFakeExecutionBehaviorTest {
|
||||
Assertions.assertFalse(sql.contains("ALL_VIEWS"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void listDatabasesSqlCanApplyVisibleSchemaFilter() {
|
||||
String sql = OracleAgent.listDatabasesSql(2).toUpperCase(Locale.ROOT);
|
||||
|
||||
Assertions.assertTrue(sql.contains("ALL_USERS"), sql);
|
||||
Assertions.assertTrue(sql.contains("USERNAME IN (?,?)"), sql);
|
||||
Assertions.assertFalse(sql.contains("ALL_TABLES"), sql);
|
||||
}
|
||||
|
||||
@Test
|
||||
void listSchemasWithEmptyVisibleFilterSkipsMetadataQuery() {
|
||||
OracleAgent agent = new OracleAgent();
|
||||
|
||||
Assertions.assertEquals(List.of(), agent.listSchemas(List.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void listTablesSqlUsesSplitDictionaryQuery() {
|
||||
String sql = OracleAgent.listTablesSql().toUpperCase(Locale.ROOT);
|
||||
|
||||
Reference in new issue
Block a user