diff --git a/agents/drivers/db2/src/main/java/com/dbx/agent/db2/Db2Agent.java b/agents/drivers/db2/src/main/java/com/dbx/agent/db2/Db2Agent.java index 5ecd2c5e50..819e523022 100644 --- a/agents/drivers/db2/src/main/java/com/dbx/agent/db2/Db2Agent.java +++ b/agents/drivers/db2/src/main/java/com/dbx/agent/db2/Db2Agent.java @@ -402,6 +402,10 @@ public final class Db2Agent extends AbstractJdbcAgent { String value = rs.getString(index); return rs.wasNull() ? null : value; } + if (sqlType == Types.BLOB || sqlType == Types.BINARY || sqlType == Types.VARBINARY || sqlType == Types.LONGVARBINARY) { + byte[] value = rs.getBytes(index); + return rs.wasNull() ? null : JdbcExecutor.bytesToHex(value); + } Object value = rs.getObject(index); return rs.wasNull() ? null : value == null ? null : value.toString(); }); diff --git a/agents/drivers/db2/src/test/java/com/dbx/agent/db2/Db2AgentTest.java b/agents/drivers/db2/src/test/java/com/dbx/agent/db2/Db2AgentTest.java index 3a3a595e3e..59fdb13ebd 100644 --- a/agents/drivers/db2/src/test/java/com/dbx/agent/db2/Db2AgentTest.java +++ b/agents/drivers/db2/src/test/java/com/dbx/agent/db2/Db2AgentTest.java @@ -70,6 +70,28 @@ class Db2AgentTest extends JdbcFakeExecutionBehaviorTest { assertEquals("long text value", agent.resultValue(resultSet, 1, Types.CLOB)); } + @Test + void readsBlobValuesAsHexInsteadOfVendorObjectNames() { + Db2Agent agent = new Db2Agent(); + ResultSet resultSet = proxy(ResultSet.class, new MethodHandler() { + @Override + public Object handle(Method method, Object[] args) { + if ("getBytes".equals(method.getName())) { + return new byte[] {(byte) 0x89, 0x50, 0x4e}; + } + if ("wasNull".equals(method.getName())) { + return false; + } + return defaultValue(method.getReturnType()); + } + }); + + assertEquals("0x89504e", agent.resultValue(resultSet, 1, Types.BLOB)); + assertEquals("0x89504e", agent.resultValue(resultSet, 1, Types.BINARY)); + assertEquals("0x89504e", agent.resultValue(resultSet, 1, Types.VARBINARY)); + assertEquals("0x89504e", agent.resultValue(resultSet, 1, Types.LONGVARBINARY)); + } + @Test void listsAllCatalogSchemasWithoutOwnerTypeFiltering() { Db2Agent agent = new Db2Agent();