Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class JdbcUtils {
byte[] bytes = resultSet.getBytes(i)
row.add(bytes == null ? null : bytesToHex(bytes))
} else {
row.add(resultSet.getObject(i))
row.add(materializeObject(resultSet.getObject(i)))
}
}
rows.add(row)
Expand All @@ -148,7 +148,7 @@ class JdbcUtils {
try {
if (isPreparedStatement) {
// For prepared statements, use getObject to get the value
row.add(resultSet.getObject(i))
row.add(materializeObject(resultSet.getObject(i)))
} else {
int jdbcType = resultSet.metaData.getColumnType(i)
if (jdbcType == Types.TIME
Expand All @@ -172,15 +172,15 @@ class JdbcUtils {
byte[] bytes = resultSet.getBytes(i)
row.add(bytes == null ? null : bytesToHex(bytes))
} else {
row.add(resultSet.getObject(i))
row.add(materializeObject(resultSet.getObject(i)))
}
}
} catch (Throwable t) {
try {
if(resultSet.getBytes(i) != null){
row.add(new String(resultSet.getBytes(i)))
} else {
row.add(resultSet.getObject(i))
row.add(materializeObject(resultSet.getObject(i)))
}
} catch (Throwable t2) {
/**
Expand All @@ -190,7 +190,7 @@ class JdbcUtils {
at org.codehaus.groovy.vmplugin.v8.IndyInterface.fromCache(IndyInterface.java:321)
at org.apache.doris.regression.util.JdbcUtils$_toStringList_closure5.doCall(JdbcUtils.groovy:163)
*/
row.add(resultSet.getObject(i))
row.add(materializeObject(resultSet.getObject(i)))
}
}
}
Expand All @@ -200,6 +200,16 @@ class JdbcUtils {
}
}

private static Object materializeObject(Object value) {
if (value instanceof java.sql.Array || value instanceof java.sql.Struct) {
return value.toString()
}
if (value instanceof byte[]) {
return bytesToHex((byte[]) value)
}
return value
}

// Detect if a JDBC column type is binary-like
private static boolean isBinaryJdbcType(int jdbcType) {
return jdbcType == Types.BINARY
Expand Down
Loading