opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-09-25 08:04:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix oracle io close bug

Browse Source
This commit is contained in:
SwallowGG
2023-12-27 20:05:38 +08:00
parent eb9ff6e8d6
commit 22add550dc
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package ai.chat2db.plugin.oracle; package ai.chat2db.plugin.oracle;
import java.io.Reader;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
@ -73,7 +74,7 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
}); });
} }
private static String SELECT_TAB_COLS = "SELECT atc.column_id , atc.column_name as COLUMN_NAME, atc.data_type as DATA_TYPE , atc.data_length as DATA_LENGTH , atc.data_type_mod , atc.nullable , atc.data_default , acc.comments , atc.DATA_PRECISION , atc.DATA_SCALE , atc.CHAR_USED FROM all_tab_columns atc, all_col_comments acc WHERE atc.owner = acc.owner AND atc.table_name = acc.table_name AND atc.column_name = acc.column_name AND atc.owner = '%s' AND atc.table_name = '%s' order by atc.column_id"; private static String SELECT_TAB_COLS = "SELECT atc.column_id , atc.column_name as COLUMN_NAME, atc.data_type as DATA_TYPE , atc.data_length as DATA_LENGTH , atc.data_type_mod , atc.nullable , atc.data_default as DATA_DEFAULT, acc.comments , atc.DATA_PRECISION , atc.DATA_SCALE , atc.CHAR_USED FROM all_tab_columns atc, all_col_comments acc WHERE atc.owner = acc.owner AND atc.table_name = acc.table_name AND atc.column_name = acc.column_name AND atc.owner = '%s' AND atc.table_name = '%s' order by atc.column_id";
@Override @Override
public List<TableColumn> columns(Connection connection, String databaseName, String schemaName, String tableName) { public List<TableColumn> columns(Connection connection, String databaseName, String schemaName, String tableName) {
@ -84,6 +85,21 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
TableColumn tableColumn = new TableColumn(); TableColumn tableColumn = new TableColumn();
tableColumn.setTableName(tableName); tableColumn.setTableName(tableName);
tableColumn.setSchemaName(schemaName); tableColumn.setSchemaName(schemaName);
try {
//
// Fields of the LONG type cannot be retrieved using getObject. They need to be accessed using getCharacterStream, and must be read first in the sequence.
Reader reader = resultSet.getCharacterStream("DATA_DEFAULT");
if(reader != null){
StringBuilder sb = new StringBuilder();
int charValue;
while ((charValue = reader.read()) != -1) {
sb.append((char) charValue);
}
tableColumn.setDefaultValue(sb.toString());
}
}catch (Exception e){
e.printStackTrace();
}
tableColumn.setName(resultSet.getString("COLUMN_NAME")); tableColumn.setName(resultSet.getString("COLUMN_NAME"));
tableColumn.setColumnType(resultSet.getString("DATA_TYPE")); tableColumn.setColumnType(resultSet.getString("DATA_TYPE"));
Integer dataPrecision = resultSet.getInt("DATA_PRECISION"); Integer dataPrecision = resultSet.getInt("DATA_PRECISION");
@ -92,7 +108,14 @@ public class OracleMetaData extends DefaultMetaService implements MetaData {
}else { }else {
tableColumn.setColumnSize(resultSet.getInt("DATA_LENGTH")); tableColumn.setColumnSize(resultSet.getInt("DATA_LENGTH"));
} }
tableColumn.setDefaultValue(resultSet.getString("DATA_DEFAULT")); // Object dataDefault = resultSet.getObject(7);
// if(dataDefault!=null) {
// tableColumn.setDefaultValue(dataDefault.toString());
// }
tableColumn.setComment(resultSet.getString("COMMENTS")); tableColumn.setComment(resultSet.getString("COMMENTS"));
tableColumn.setNullable("Y".equalsIgnoreCase(resultSet.getString("NULLABLE")) ? 1 : 0); tableColumn.setNullable("Y".equalsIgnoreCase(resultSet.getString("NULLABLE")) ? 1 : 0);
tableColumn.setOrdinalPosition(resultSet.getInt("COLUMN_ID")); tableColumn.setOrdinalPosition(resultSet.getInt("COLUMN_ID"));

2
chat2db-server/chat2db-spi/src/main/java/ai/chat2db/spi/jdbc/DefaultValueHandler.java
View File

@ -36,7 +36,7 @@ public class DefaultValueHandler implements ValueHandler {
} else if (obj instanceof Blob blob) { } else if (obj instanceof Blob blob) {
return largeStringBlob(blob, limitSize); return largeStringBlob(blob, limitSize);
} }
return rs.getString(index); return obj.toString();
} catch (Exception e) { } catch (Exception e) {
log.warn("解析数失败:{},{}", index, obj, e); log.warn("解析数失败:{},{}", index, obj, e);
return obj.toString(); return obj.toString();