diff --git a/chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleMetaData.java b/chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleMetaData.java index 132b5f99..60e60d7e 100644 --- a/chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleMetaData.java +++ b/chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleMetaData.java @@ -242,8 +242,9 @@ public class OracleMetaData extends DefaultMetaService implements MetaData { return SQLExecutor.getInstance().execute(connection, String.format(TRIGGER_SQL_LIST, schemaName), resultSet -> { while (resultSet.next()) { + String triggerName = resultSet.getString("TRIGGER_NAME"); Trigger trigger = new Trigger(); - trigger.setTriggerName(resultSet.getString("TRIGGER_NAME")); + trigger.setTriggerName(triggerName==null?"":triggerName.trim()); trigger.setSchemaName(schemaName); trigger.setDatabaseName(databaseName); triggers.add(trigger); @@ -255,7 +256,6 @@ public class OracleMetaData extends DefaultMetaService implements MetaData { @Override public Trigger trigger(Connection connection, @NotEmpty String databaseName, String schemaName, String triggerName) { - String sql = String.format(ROUTINES_SQL, "TRIGGER", triggerName); return SQLExecutor.getInstance().execute(connection, sql, resultSet -> { StringBuilder sb = new StringBuilder(); diff --git a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java index 80889a5b..6a771095 100644 --- a/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java +++ b/chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java @@ -75,7 +75,11 @@ public class DefaultMetaService implements MetaData { if(CollectionUtils.isEmpty(functions)){ return functions; } - return functions.stream().filter(function -> StringUtils.isNotBlank(function.getFunctionName())).collect(Collectors.toList()); + return functions.stream().filter(function -> StringUtils.isNotBlank(function.getFunctionName())).map(function -> { + String functionName = function.getFunctionName(); + function.setFunctionName(functionName.trim()); + return function; + }).collect(Collectors.toList()); } @Override @@ -90,7 +94,11 @@ public class DefaultMetaService implements MetaData { if(CollectionUtils.isEmpty(procedures)){ return procedures; } - return procedures.stream().filter(function -> StringUtils.isNotBlank(function.getProcedureName())).collect(Collectors.toList()); + return procedures.stream().filter(function -> StringUtils.isNotBlank(function.getProcedureName())).map(procedure -> { + String procedureName = procedure.getProcedureName(); + procedure.setProcedureName(procedureName.trim()); + return procedure; + }).collect(Collectors.toList()); } @Override