From 070e09c6153988a49bfac1d3e607103421d031f6 Mon Sep 17 00:00:00 2001 From: zipg Date: Fri, 25 Sep 2026 23:52:18 +0800 Subject: [PATCH] fix(iris): display %Boolean columns as stored 1/0 values --- .../java/com/dbx/agent/cache/CacheAgent.java | 9 ++++ .../com/dbx/agent/cache/CacheAgentTest.java | 41 +++++++++++++++++++ .../java/com/dbx/agent/iris/IrisAgent.java | 9 ++++ .../com/dbx/agent/iris/IrisAgentTest.java | 41 +++++++++++++++++++ 4 files changed, 100 insertions(+) diff --git a/agents/drivers/cache/src/main/java/com/dbx/agent/cache/CacheAgent.java b/agents/drivers/cache/src/main/java/com/dbx/agent/cache/CacheAgent.java index d13b931414..0ba44afd64 100644 --- a/agents/drivers/cache/src/main/java/com/dbx/agent/cache/CacheAgent.java +++ b/agents/drivers/cache/src/main/java/com/dbx/agent/cache/CacheAgent.java @@ -53,6 +53,15 @@ public final class CacheAgent extends ConfiguredJdbcAgent { Object value = rs.getBigDecimal(index); return rs.wasNull() ? null : value; }); + case Types.BIT: + case Types.BOOLEAN: + // Caché has no boolean type: %Boolean is stored as 1/0 and only + // the JDBC driver turns it into a Java boolean, which would + // surface as true/false in the grid. Report the stored 1/0. + return unchecked(() -> { + int value = rs.getInt(index); + return rs.wasNull() ? null : value; + }); case Types.OTHER: return unchecked(() -> JdbcExecutor.normalizeResultValue(rs.getObject(index))); default: diff --git a/agents/drivers/cache/src/test/java/com/dbx/agent/cache/CacheAgentTest.java b/agents/drivers/cache/src/test/java/com/dbx/agent/cache/CacheAgentTest.java index e8d739c086..84f4c85a9d 100644 --- a/agents/drivers/cache/src/test/java/com/dbx/agent/cache/CacheAgentTest.java +++ b/agents/drivers/cache/src/test/java/com/dbx/agent/cache/CacheAgentTest.java @@ -159,6 +159,47 @@ class CacheAgentTest { assertEquals(Collections.singletonList("getObject"), calls); } + @Test + void readsBitColumnsAsStoredNumbers() { + for (int sqlType : new int[] {Types.BIT, Types.BOOLEAN}) { + List calls = new ArrayList<>(); + ResultSet resultSet = proxy(ResultSet.class, (method, args) -> { + if ("getInt".equals(method.getName())) { + calls.add("getInt"); + return 1; + } + if (method.getName().startsWith("get")) { + calls.add(method.getName()); + throw new AssertionError("Caché %Boolean must not be read as a Java boolean"); + } + if ("wasNull".equals(method.getName())) { + return false; + } + return defaultValue(method.getReturnType()); + }); + + Object value = new CacheAgent().resultValue(resultSet, 1, sqlType); + + assertEquals(1, value); + assertEquals(Collections.singletonList("getInt"), calls); + } + } + + @Test + void preservesNullForBitColumns() { + ResultSet resultSet = proxy(ResultSet.class, (method, args) -> { + if ("getInt".equals(method.getName())) { + return 0; + } + if ("wasNull".equals(method.getName())) { + return true; + } + return defaultValue(method.getReturnType()); + }); + + assertNull(new CacheAgent().resultValue(resultSet, 1, Types.BIT)); + } + @Test void readsColumnsAndUsesInlinePrimaryKey() { List calls = new ArrayList<>(); diff --git a/agents/drivers/iris/src/main/java/com/dbx/agent/iris/IrisAgent.java b/agents/drivers/iris/src/main/java/com/dbx/agent/iris/IrisAgent.java index fbc07fc6bd..d141e6cb33 100644 --- a/agents/drivers/iris/src/main/java/com/dbx/agent/iris/IrisAgent.java +++ b/agents/drivers/iris/src/main/java/com/dbx/agent/iris/IrisAgent.java @@ -78,6 +78,15 @@ public final class IrisAgent extends ConfiguredJdbcAgent { Object value = rs.getBigDecimal(index); return rs.wasNull() ? null : value; }); + case Types.BIT: + case Types.BOOLEAN: + // IRIS has no boolean type: %Boolean is stored as 1/0 and only + // the JDBC driver turns it into a Java boolean, which would + // surface as true/false in the grid. Report the stored 1/0. + return unchecked(() -> { + int value = rs.getInt(index); + return rs.wasNull() ? null : value; + }); case Types.OTHER: return unchecked(() -> JdbcExecutor.normalizeResultValue(rs.getObject(index))); default: diff --git a/agents/drivers/iris/src/test/java/com/dbx/agent/iris/IrisAgentTest.java b/agents/drivers/iris/src/test/java/com/dbx/agent/iris/IrisAgentTest.java index 98ac28d883..7e492a1bbf 100644 --- a/agents/drivers/iris/src/test/java/com/dbx/agent/iris/IrisAgentTest.java +++ b/agents/drivers/iris/src/test/java/com/dbx/agent/iris/IrisAgentTest.java @@ -147,6 +147,47 @@ class IrisAgentTest { assertEquals(Collections.singletonList("getObject"), calls); } + @Test + void readsBitColumnsAsStoredNumbers() { + for (int sqlType : new int[] {Types.BIT, Types.BOOLEAN}) { + List calls = new ArrayList<>(); + ResultSet resultSet = proxy(ResultSet.class, (method, args) -> { + if ("getInt".equals(method.getName())) { + calls.add("getInt"); + return 1; + } + if (method.getName().startsWith("get")) { + calls.add(method.getName()); + throw new AssertionError("IRIS %Boolean must not be read as a Java boolean"); + } + if ("wasNull".equals(method.getName())) { + return false; + } + return defaultValue(method.getReturnType()); + }); + + Object value = new IrisAgent().resultValue(resultSet, 1, sqlType); + + assertEquals(1, value); + assertEquals(Collections.singletonList("getInt"), calls); + } + } + + @Test + void preservesNullForBitColumns() { + ResultSet resultSet = proxy(ResultSet.class, (method, args) -> { + if ("getInt".equals(method.getName())) { + return 0; + } + if ("wasNull".equals(method.getName())) { + return true; + } + return defaultValue(method.getReturnType()); + }); + + assertNull(new IrisAgent().resultValue(resultSet, 1, Types.BIT)); + } + @Test void readsColumnsAndUsesInlinePrimaryKey() { List calls = new ArrayList<>();