Skip to content

feat(jdbc): expose privileges and richer trigger metadata #39

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
stbischof merged 1 commit into from
Jul 20, 2026
Merged

feat(jdbc): expose privileges and richer trigger metadata #39

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
9 changes: 9 additions & 0 deletions jdbc/api/src/main/java/org/eclipse/daanse/sql/jdbc/api/MetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,15 @@ default Optional<List<TablePrivilege>> getAllTablePrivileges(Connection connecti
return Optional.empty();
}

/**
* Privileges on non-table objects (schema, database, routine, sequence, ...);
* no JDBC equivalent exists.
*/
default Optional<List<org.eclipse.daanse.sql.jdbc.api.schema.ObjectPrivilege>> getAllObjectPrivileges(
Connection connection, String catalog, String schema) throws SQLException {
return Optional.empty();
}

/**
* Per-table alternative to
* {@link java.sql.DatabaseMetaData#getColumnPrivileges(String, String, String, String)}.
Expand Down
15 changes: 15 additions & 0 deletions jdbc/api/src/main/java/org/eclipse/daanse/sql/jdbc/api/meta/StructureInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,19 @@ default List<org.eclipse.daanse.sql.jdbc.api.schema.Partition> partitions() {
return List.of();
}

/** @return the table privileges, empty list if not available */
default List<org.eclipse.daanse.sql.jdbc.api.schema.TablePrivilege> tablePrivileges() {
return List.of();
}

/** @return the column privileges, empty list if not available */
default List<org.eclipse.daanse.sql.jdbc.api.schema.ColumnPrivilege> columnPrivileges() {
return List.of();
}

/** @return privileges on non-table objects (schema, database, routine, ...), empty list if not available */
default List<org.eclipse.daanse.sql.jdbc.api.schema.ObjectPrivilege> objectPrivileges() {
return List.of();
}

}
48 changes: 48 additions & 0 deletions jdbc/api/src/main/java/org/eclipse/daanse/sql/jdbc/api/schema/ObjectPrivilege.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright (c) 2026 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* SmartCity Jena - initial
* Stefan Bischof (bipolis.org) - initial
*/
package org.eclipse.daanse.sql.jdbc.api.schema;

import java.util.Optional;

/**
* A privilege granted on a non-table securable object — schema, database,
* function, procedure, package, sequence, directory, ... Table and column
* privileges stay in {@link TablePrivilege}/{@link ColumnPrivilege}.
*/
public interface ObjectPrivilege {

/** Raw object kind as the dialect reports it: SCHEMA, DATABASE, FUNCTION, SEQUENCE, ... */
String objectKind();

/** @return the catalog/database qualifier, or empty */
Optional<String> catalogName();

/** @return the schema qualifier, or empty (schema- and database-level rows) */
Optional<String> schemaName();

/** The object's name. */
String objectName();

/** Principal that granted the privilege (or empty if unknown). */
Optional<String> grantor();

/** Principal that received the privilege. */
String grantee();

/** Privilege kind: USAGE, CREATE, EXECUTE, CONNECT, ... */
String privilege();

/** "YES", "NO", or empty if unknown. */
Optional<String> isGrantable();
}
16 changes: 15 additions & 1 deletion jdbc/impl/src/main/java/org/eclipse/daanse/sql/jdbc/impl/DatabaseServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,23 @@ protected MetaInfo readMetaInfoWithProvider(Connection connection, DatabaseMetaD
viewDefinitions = filteredViews;
}

// Privileges — only via dialect providers; the plain-JDBC path stays without them.
List<org.eclipse.daanse.sql.jdbc.api.schema.TablePrivilege> tablePrivileges =
provider.getAllTablePrivileges(connection, null, null, null).orElse(List.of());
List<org.eclipse.daanse.sql.jdbc.api.schema.ColumnPrivilege> columnPrivileges = new ArrayList<>();
for (TableDefinition td : tables) {
String tpSchema = td.table().schema().map(SchemaReference::name).orElse(null);
provider.getColumnPrivileges(connection, null, tpSchema, td.table().name(), null)
.ifPresent(columnPrivileges::addAll);
}

List<org.eclipse.daanse.sql.jdbc.api.schema.ObjectPrivilege> objectPrivileges =
provider.getAllObjectPrivileges(connection, null, null).orElse(List.of());

StructureInfo structureInfo = new StructureInfoRecord(catalogs, schemas, tables, columns,
importedKeys, primaryKeys, triggers, sequences, checkConstraints, uniqueConstraints,
userDefinedTypes, viewDefinitions, procedures, functions, materializedViews, partitions);
userDefinedTypes, viewDefinitions, procedures, functions, materializedViews, partitions,
tablePrivileges, List.copyOf(columnPrivileges), objectPrivileges);
return new MetaInfoRecord(databaseInfo, structureInfo, identifierInfo, typeInfos, indexInfos);
}

Expand Down
91 changes: 69 additions & 22 deletions jdbc/metadata/src/main/java/org/eclipse/daanse/sql/jdbc/metadata/OracleMetadataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class OracleMetadataProvider implements MetadataProvider {
@Override
public List<Trigger> getAllTriggers(Connection connection, String catalog, String schema) throws SQLException {
String sql = """
SELECT TRIGGER_NAME, TABLE_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, TRIGGER_BODY
SELECT TRIGGER_NAME, TABLE_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, WHEN_CLAUSE, TRIGGER_BODY
FROM ALL_TRIGGERS WHERE OWNER = ? ORDER BY TABLE_NAME, TRIGGER_NAME
""";
String schemaName = resolveSchema(schema, connection);
Expand All @@ -115,7 +115,7 @@ public List<Trigger> getAllTriggers(Connection connection, String catalog, Strin
public List<Trigger> getTriggers(Connection connection, String catalog, String schema, String tableName)
throws SQLException {
String sql = """
SELECT TRIGGER_NAME, TABLE_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, TRIGGER_BODY
SELECT TRIGGER_NAME, TABLE_NAME, TRIGGER_TYPE, TRIGGERING_EVENT, WHEN_CLAUSE, TRIGGER_BODY
FROM ALL_TRIGGERS WHERE OWNER = ? AND TABLE_NAME = ?
ORDER BY TRIGGER_NAME
""";
Expand Down Expand Up @@ -876,6 +876,7 @@ private Trigger readTrigger(ResultSet rs, String schemaName) throws SQLException
String tableName = rs.getString("TABLE_NAME");
String triggerType = rs.getString("TRIGGER_TYPE");
String triggeringEvent = rs.getString("TRIGGERING_EVENT");
String whenClause = rs.getString("WHEN_CLAUSE");

// TRIGGER_BODY is LONG type, wrap in try-catch
String triggerBody;
Expand All @@ -890,10 +891,11 @@ private Trigger readTrigger(ResultSet rs, String schemaName) throws SQLException
TableReference tableRef = new TableReference(oSchema, tableName);

TriggerTiming timing = mapOracleTriggerTiming(triggerType);
TriggerEvent event = mapOracleTriggerEvent(triggeringEvent);
List<TriggerEvent> events = mapOracleTriggerEvents(triggeringEvent);
String orientation = parseOracleOrientation(triggerType);

return new TriggerRecord(new TriggerReference(tableRef, triggerName), timing, event,
return new TriggerRecord(new TriggerReference(tableRef, triggerName), timing, events,
Optional.ofNullable(whenClause).map(String::strip).filter(w -> !w.isEmpty()),
Optional.ofNullable(triggerBody), Optional.empty(), Optional.ofNullable(orientation));
}

Expand Down Expand Up @@ -1088,17 +1090,21 @@ private static TriggerTiming mapOracleTriggerTiming(String triggerType) {
}


private static TriggerEvent mapOracleTriggerEvent(String triggeringEvent) {
private static List<TriggerEvent> mapOracleTriggerEvents(String triggeringEvent) {
if (triggeringEvent == null) {
return TriggerEvent.INSERT;
return List.of(TriggerEvent.INSERT);
}
// Take the first word: 'INSERT OR UPDATE' -> 'INSERT'
String firstWord = triggeringEvent.trim().split("\\s+")[0].toUpperCase();
return switch (firstWord) {
case "UPDATE" -> TriggerEvent.UPDATE;
case "DELETE" -> TriggerEvent.DELETE;
default -> TriggerEvent.INSERT;
};
// 'INSERT OR UPDATE OR DELETE' -> [INSERT, UPDATE, DELETE]
List<TriggerEvent> events = new ArrayList<>();
for (String word : triggeringEvent.trim().toUpperCase().split("\\s+OR\\s+")) {
switch (word.trim()) {
case "INSERT" -> events.add(TriggerEvent.INSERT);
case "UPDATE" -> events.add(TriggerEvent.UPDATE);
case "DELETE" -> events.add(TriggerEvent.DELETE);
default -> LOGGER.debug("Ignoring unsupported Oracle trigger event {}", word);
}
}
return events.isEmpty() ? List.of(TriggerEvent.INSERT) : List.copyOf(events);
}


Expand Down Expand Up @@ -1189,10 +1195,15 @@ public Optional<List<TablePrivilege>> getAllTablePrivileges(Connection connectio
// grants,
// and grants made by others are all returned. JDBC's getTablePrivileges only
// returns direct grants to the connected user.
// ALL_TAB_PRIVS covers every object type — scope to table-like objects;
// everything else is reported via getAllObjectPrivileges.
StringBuilder sql = new StringBuilder("""
SELECT OWNER, TABLE_NAME, GRANTOR, GRANTEE, PRIVILEGE, GRANTABLE
FROM ALL_TAB_PRIVS
WHERE OWNER = ?
SELECT TABLE_SCHEMA, TABLE_NAME, GRANTOR, GRANTEE, PRIVILEGE, GRANTABLE
FROM ALL_TAB_PRIVS t
WHERE TABLE_SCHEMA = ?
AND EXISTS (SELECT 1 FROM ALL_OBJECTS o WHERE o.OWNER = t.TABLE_SCHEMA
AND o.OBJECT_NAME = t.TABLE_NAME
AND o.OBJECT_TYPE IN ('TABLE', 'VIEW', 'MATERIALIZED VIEW'))
""");
boolean hasTableFilter = tableNamePattern != null && !tableNamePattern.isBlank()
&& !"%".equals(tableNamePattern);
Expand Down Expand Up @@ -1231,6 +1242,39 @@ public Optional<List<TablePrivilege>> getAllTablePrivileges(Connection connectio
}


@Override
public Optional<List<org.eclipse.daanse.sql.jdbc.api.schema.ObjectPrivilege>> getAllObjectPrivileges(
Connection connection, String catalog, String schema) throws SQLException {
// Non-table objects from ALL_TAB_PRIVS: procedures, functions, packages,
// sequences, types, directories, ... (bodies excluded).
String sql = """
SELECT DISTINCT t.TABLE_NAME AS OBJECT_NAME, o.OBJECT_TYPE, t.GRANTOR, t.GRANTEE,
t.PRIVILEGE, t.GRANTABLE
FROM ALL_TAB_PRIVS t
JOIN ALL_OBJECTS o ON o.OWNER = t.TABLE_SCHEMA AND o.OBJECT_NAME = t.TABLE_NAME
WHERE t.TABLE_SCHEMA = ?
AND o.OBJECT_TYPE NOT IN ('TABLE', 'VIEW', 'MATERIALIZED VIEW')
AND o.OBJECT_TYPE NOT LIKE '%BODY'
ORDER BY o.OBJECT_TYPE, OBJECT_NAME, t.PRIVILEGE, t.GRANTEE
""";
String schemaName = resolveSchema(schema, connection);
List<org.eclipse.daanse.sql.jdbc.api.schema.ObjectPrivilege> result = new ArrayList<>();
try (PreparedStatement ps = connection.prepareStatement(sql)) {
ps.setString(1, schemaName);
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
result.add(new org.eclipse.daanse.sql.jdbc.record.schema.ObjectPrivilegeRecord(
rs.getString("OBJECT_TYPE"), Optional.empty(), Optional.of(schemaName),
rs.getString("OBJECT_NAME"), Optional.ofNullable(rs.getString("GRANTOR")),
rs.getString("GRANTEE"), rs.getString("PRIVILEGE"),
Optional.ofNullable(rs.getString("GRANTABLE"))));
}
}
}
return Optional.of(List.copyOf(result));
}


@Override
public Optional<List<ColumnPrivilege>> getColumnPrivileges(Connection connection, String catalog, String schema,
String tableName, String columnNamePattern) throws SQLException {
Expand Down Expand Up @@ -1410,11 +1454,13 @@ public Optional<List<org.eclipse.daanse.sql.model.schema.ColumnDefinition>> getA
Connection connection, String catalog, String schemaPattern, String tableNamePattern,
String columnNamePattern) throws SQLException {
String sql = """
SELECT OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION,
DATA_SCALE, NULLABLE, DATA_DEFAULT, COLUMN_ID
FROM ALL_TAB_COLS
WHERE OWNER = ? AND HIDDEN_COLUMN = 'NO'
ORDER BY OWNER, TABLE_NAME, COLUMN_ID
SELECT t.OWNER, t.TABLE_NAME, t.COLUMN_NAME, t.DATA_TYPE, t.DATA_LENGTH, t.DATA_PRECISION,
t.DATA_SCALE, t.NULLABLE, t.DATA_DEFAULT, t.COLUMN_ID, c.COMMENTS
FROM ALL_TAB_COLS t
LEFT JOIN ALL_COL_COMMENTS c
ON c.OWNER = t.OWNER AND c.TABLE_NAME = t.TABLE_NAME AND c.COLUMN_NAME = t.COLUMN_NAME
WHERE t.OWNER = ? AND t.HIDDEN_COLUMN = 'NO'
ORDER BY t.OWNER, t.TABLE_NAME, t.COLUMN_ID
""";
String schemaName = resolveSchema(schemaPattern, connection);
List<org.eclipse.daanse.sql.model.schema.ColumnDefinition> out = new ArrayList<>();
Expand All @@ -1433,6 +1479,7 @@ public Optional<List<org.eclipse.daanse.sql.model.schema.ColumnDefinition>> getA
boolean scaleNull = rs.wasNull();
String nullable = rs.getString("NULLABLE");
String columnDefault = rs.getString("DATA_DEFAULT"); // bufferable here
String comments = rs.getString("COMMENTS");

java.sql.JDBCType jdbcType = mapOracleType(dataType);
java.util.OptionalInt size;
Expand All @@ -1457,7 +1504,7 @@ public Optional<List<org.eclipse.daanse.sql.model.schema.ColumnDefinition>> getA

org.eclipse.daanse.sql.model.schema.ColumnMetaData meta = new org.eclipse.daanse.sql.jdbc.record.schema.ColumnMetaDataRecord(
jdbcType, dataType, size, scale, java.util.OptionalInt.empty(), n,
java.util.OptionalInt.empty(), Optional.empty(),
java.util.OptionalInt.empty(), Optional.ofNullable(comments),
Optional.ofNullable(columnDefault).map(String::trim).filter(s -> !s.isEmpty()),
org.eclipse.daanse.sql.model.schema.ColumnMetaData.AutoIncrement.UNKNOWN,
org.eclipse.daanse.sql.model.schema.ColumnMetaData.GeneratedColumn.UNKNOWN);
Expand Down
Loading
Loading