opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-29 18:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix :oracle trigger bug

Browse Source
This commit is contained in:
SwallowGG
2024-03-24 17:24:44 +08:00
parent e99fb37982
commit e7909cdf61
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chat2db-server/chat2db-plugins/chat2db-oracle/src/main/java/ai/chat2db/plugin/oracle/OracleMetaData.java
View File

@ -242,8 +242,9 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
return SQLExecutor.getInstance().execute(connection, String.format(TRIGGER_SQL_LIST, schemaName), return SQLExecutor.getInstance().execute(connection, String.format(TRIGGER_SQL_LIST, schemaName),
resultSet -> { resultSet -> {
while (resultSet.next()) { while (resultSet.next()) {
String triggerName = resultSet.getString("TRIGGER_NAME");
Trigger trigger = new Trigger(); Trigger trigger = new Trigger();
trigger.setTriggerName(resultSet.getString("TRIGGER_NAME")); trigger.setTriggerName(triggerName==null?"":triggerName.trim());
trigger.setSchemaName(schemaName); trigger.setSchemaName(schemaName);
trigger.setDatabaseName(databaseName); trigger.setDatabaseName(databaseName);
triggers.add(trigger); triggers.add(trigger);
@ -255,7 +256,6 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
@Override @Override
public Trigger trigger(Connection connection, @NotEmpty String databaseName, String schemaName, public Trigger trigger(Connection connection, @NotEmpty String databaseName, String schemaName,
String triggerName) { String triggerName) {
String sql = String.format(ROUTINES_SQL, "TRIGGER", triggerName); String sql = String.format(ROUTINES_SQL, "TRIGGER", triggerName);
return SQLExecutor.getInstance().execute(connection, sql, resultSet -> { return SQLExecutor.getInstance().execute(connection, sql, resultSet -> {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

12
chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultMetaService.java
View File

@ -75,7 +75,11 @@ public class DefaultMetaService implements MetaData {
if(CollectionUtils.isEmpty(functions)){ if(CollectionUtils.isEmpty(functions)){
return 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 @Override
@ -90,7 +94,11 @@ public class DefaultMetaService implements MetaData {
if(CollectionUtils.isEmpty(procedures)){ if(CollectionUtils.isEmpty(procedures)){
return 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 @Override