Skip to content

[fix][PES][datasource] fix DB2 schema query to use correct SQL instead of invalid command #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aiceflower merged 1 commit into from
Apr 12, 2026
+22 −14
Merged

[fix][PES][datasource] fix DB2 schema query to use correct SQL instead of invalid command #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions ...ervice/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ public class SqlConnection implements Closeable {
private static final CommonVars<String> SQL_CONNECT_URL =
CommonVars.apply("wds.linkis.server.mdm.service.db2.url", "jdbc:db2://%s:%s/%s");

/**
* SQL query to get schema/database list. Default: only show user schemas, excluding system
* schemas (SYS*, NULLID, SQLJ). To show all schemas, configure: "SELECT SCHEMANAME FROM
* SYSCAT.SCHEMATA WITH UR"
*/
private static final CommonVars<String> SQL_SCHEMA_QUERY =
CommonVars.apply(
"wds.linkis.server.mdm.service.db2.schema.query.sql",
"SELECT SCHEMANAME FROM SYSCAT.SCHEMATA WHERE SCHEMANAME NOT LIKE 'SYS%' AND SCHEMANAME != 'NULLID' AND SCHEMANAME != 'SQLJ' WITH UR");

private Connection conn;

private ConnectMessage connectMessage;
Expand All @@ -67,22 +77,21 @@ public SqlConnection(
}

public List<String> getAllDatabases() throws SQLException {
// db2 "select schemaname from syscat.schemata"
List<String> dataBaseName = new ArrayList<>();
// Query schema list using configurable SQL (default: only user schemas)
List<String> schemaNames = new ArrayList<>();
Statement stmt = null;
ResultSet rs = null;
try {
stmt = conn.createStatement();
rs = stmt.executeQuery("list database directory");
// rs = stmt.executeQuery("SELECT * FROM SYSIBMADM.APPLICATIONS WITH UR");
// rs = stmt.executeQuery("select * from syscat.tables");
// Use configurable SQL query for schema list
rs = stmt.executeQuery(SQL_SCHEMA_QUERY.getValue());
while (rs.next()) {
dataBaseName.add(rs.getString(1));
schemaNames.add(rs.getString(1));
}
} finally {
closeResource(null, stmt, rs);
}
return dataBaseName;
return schemaNames;
}

public List<String> getAllTables(String tabschema) throws SQLException {
Expand Down
13 changes: 6 additions & 7 deletions ...ervice/jdbc/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,21 @@ public SqlConnection(
}

public List<String> getAllDatabases() throws SQLException {
// db2 "select schemaname from syscat.schemata"
List<String> dataBaseName = new ArrayList<>();
// Query schema list from system catalog view
List<String> schemaNames = new ArrayList<>();
Statement stmt = null;
ResultSet rs = null;
try {
stmt = conn.createStatement();
rs = stmt.executeQuery("list database directory");
// rs = stmt.executeQuery("SELECT * FROM SYSIBMADM.APPLICATIONS WITH UR");
// rs = stmt.executeQuery("select * from syscat.tables");
// Query all schemas from SYSCAT.SCHEMATA (DB2 system catalog)
rs = stmt.executeQuery("SELECT SCHEMANAME FROM SYSCAT.SCHEMATA WITH UR");
while (rs.next()) {
dataBaseName.add(rs.getString(1));
schemaNames.add(rs.getString(1));
}
} finally {
closeResource(null, stmt, rs);
}
return dataBaseName;
return schemaNames;
}

public List<String> getAllTables(String tabschema) throws SQLException {
Expand Down
Loading