Fix fetching null values (#57)

* Fix fetching null values * Add isNull check to getObject(String)
ing-bank · May 23, 2024 · 1d49d7a · 1d49d7a
1 parent 35e47fe
commit 1d49d7a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/com/ing/data/cassandra/jdbc/CassandraResultSet.java b/src/main/java/com/ing/data/cassandra/jdbc/CassandraResultSet.java
@@ -886,6 +886,10 @@ public Object getObject(final int columnIndex) throws SQLException {
         final DataType cqlDataType = getCqlDataType(columnIndex);
         final DataTypeEnum dataType = fromDataType(cqlDataType);
 
+        if (currentRow.isNull(columnIndex - 1)) {
+            return null;
+        }
+
         // User-defined types
         if (isCqlType(columnIndex, DataTypeEnum.UDT)) {
             return this.currentRow.getUdtValue(columnIndex - 1);
@@ -1022,6 +1026,10 @@ public Object getObject(final String columnLabel) throws SQLException {
         final DataType cqlDataType = getCqlDataType(columnLabel);
         final DataTypeEnum dataType = fromDataType(cqlDataType);
 
+        if (currentRow.isNull(columnLabel)) {
+            return null;
+        }
+
         // User-defined types
         if (isCqlType(columnLabel, DataTypeEnum.UDT)) {
             return this.currentRow.getUdtValue(columnLabel);

diff --git a/src/test/java/com/ing/data/cassandra/jdbc/ResultSetUnitTest.java b/src/test/java/com/ing/data/cassandra/jdbc/ResultSetUnitTest.java
@@ -30,6 +30,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -140,4 +141,13 @@ void givenResultSetWithRows_whenGetCharacterStream_returnExpectedValue() throws
         assertArrayEquals("testValueAsClobInUtf8 with accents: Äîéè".getBytes(StandardCharsets.UTF_8), byteArray);
     }
 
+    @Test
+    void givenNullValue_whenFetchingValue_returnNull() throws Exception {
+        final String cql = "select (int) null from system.local";
+        final Statement statement = sqlConnection.createStatement();
+        final ResultSet rs = statement.executeQuery(cql);
+        assertTrue(rs.next());
+        Object result = rs.getObject(1);
+        assertNull(result);
+    }
 }