github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-15 14:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(informix): hide empty owners without losing routines

Browse Source
This commit is contained in:
hb authored and GitHub committed 2026-08-05 11:36:33 +08:00
1 parent 336fbe094b
commit 5bd9f41abe
2 files changed
+12 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

agents/drivers/informix/src/main/java/com/dbx/agent/informix/InformixAgent.java
+6 -9
View File
@@ -24,10 +24,10 @@ import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
public final class InformixAgent extends AbstractJdbcAgent { public final class InformixAgent extends AbstractJdbcAgent {
private String loginOwner = ""; private String loginOwner = "";
@@ -187,28 +187,25 @@ public final class InformixAgent extends AbstractJdbcAgent {
} }
} }
} }
return mergeSchemaOwners(catalogOwners, loginOwner); return normalizeSchemaOwners(catalogOwners);
}); });
} }
static String schemaCatalogSql() { static String schemaCatalogSql() {
// Informix JDBC catalogs are databases; schemas are the object owners in the current database. // Informix schemas are object owners. Include routine-only owners because
// the same sidebar node also exposes procedures and functions.
return "SELECT owner FROM systables WHERE tabid >= 100 AND owner IS NOT NULL " return "SELECT owner FROM systables WHERE tabid >= 100 AND owner IS NOT NULL "
+ "UNION SELECT owner FROM sysprocedures WHERE owner IS NOT NULL ORDER BY owner"; + "UNION SELECT owner FROM sysprocedures WHERE owner IS NOT NULL ORDER BY owner";
} }
static List<String> mergeSchemaOwners(List<String> catalogOwners, String loginOwner) { static List<String> normalizeSchemaOwners(List<String> catalogOwners) {
Set<String> owners = new TreeSet<>(); Set<String> owners = new LinkedHashSet<>();
for (String owner : catalogOwners) { for (String owner : catalogOwners) {
String normalized = normalizeOwner(owner); String normalized = normalizeOwner(owner);
if (!normalized.isEmpty()) { if (!normalized.isEmpty()) {
owners.add(normalized); owners.add(normalized);
} }
} }
String normalizedLoginOwner = normalizeOwner(loginOwner);
if (!normalizedLoginOwner.isEmpty()) {
owners.add(normalizedLoginOwner);
}
return new ArrayList<>(owners); return new ArrayList<>(owners);
} }
agents/drivers/informix/src/test/java/com/dbx/agent/informix/InformixAgentTest.java
+6 -7
View File
@@ -173,7 +173,7 @@ class InformixAgentTest {
} }
@Test @Test
void listsSchemasFromTableRoutineAndCurrentLoginOwners() { void listsSchemasFromTableAndRoutineOwnersWithoutLoginFallback() {
InformixAgent agent = new InformixAgent(); InformixAgent agent = new InformixAgent();
java.sql.Connection connection = JdbcMetadataSqlFake.connection(); java.sql.Connection connection = JdbcMetadataSqlFake.connection();
TestSupport.setPrivateConnection(agent, connection); TestSupport.setPrivateConnection(agent, connection);
@@ -181,7 +181,7 @@ class InformixAgentTest {
params.setUsername("current_owner"); params.setUsername("current_owner");
agent.afterConnect(params, connection); agent.afterConnect(params, connection);
Assertions.assertEquals(List.of("current_owner"), agent.listSchemas()); Assertions.assertEquals(List.of(), agent.listSchemas());
Assertions.assertEquals( Assertions.assertEquals(
List.of("SELECT owner FROM systables WHERE tabid >= 100 AND owner IS NOT NULL " List.of("SELECT owner FROM systables WHERE tabid >= 100 AND owner IS NOT NULL "
@@ -189,12 +189,11 @@ class InformixAgentTest {
JdbcMetadataSqlFake.statements JdbcMetadataSqlFake.statements
); );
Assertions.assertEquals( Assertions.assertEquals(
List.of("current_owner", "routine_owner", "table_owner"), List.of("table_owner", "routine_owner"),
InformixAgent.mergeSchemaOwners( InformixAgent.normalizeSchemaOwners(List.of("table_owner", "routine_owner", "routine_owner", " "))
List.of("table_owner", "routine_owner", "routine_owner", " "),
"current_owner"
)
); );
Assertions.assertTrue(InformixAgent.schemaCatalogSql().contains("sysprocedures"));
Assertions.assertFalse(InformixAgent.normalizeSchemaOwners(List.of("routine_owner", " ")).contains("current_owner"));
Assertions.assertNotEquals(InformixAgent.databaseCatalogSql(), InformixAgent.schemaCatalogSql()); Assertions.assertNotEquals(InformixAgent.databaseCatalogSql(), InformixAgent.schemaCatalogSql());
} }