Fix issue with using Null as DateType

snowflakedb · Oct 26, 2023 · 10bac5d · 10bac5d
1 parent 4453b41
commit 10bac5d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/main/java/net/snowflake/client/core/arrow/VarCharConverter.java b/src/main/java/net/snowflake/client/core/arrow/VarCharConverter.java
@@ -5,6 +5,9 @@
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.sql.Date;
+import java.util.TimeZone;
+
 import net.snowflake.client.core.DataConversionContext;
 import net.snowflake.client.core.SFException;
 import net.snowflake.client.jdbc.ErrorCode;
@@ -143,4 +146,16 @@ public boolean toBoolean(int index) throws SFException {
           SnowflakeUtil.BOOLEAN_STR, str);
     }
   }
+
+  @Override
+  public Date toDate(int index, TimeZone jvmTz, boolean useDateFormat) throws SFException {
+    if (isNull(index))
+    {
+      return null;
+    } else {
+      throw new SFException(
+              ErrorCode.INVALID_VALUE_CONVERT, logicalTypeStr,
+              SnowflakeUtil.DATE_STR, "");
+    }
+  }
 }
diff --git a/src/test/java/net/snowflake/client/core/arrow/VarCharConverterTest.java b/src/test/java/net/snowflake/client/core/arrow/VarCharConverterTest.java
@@ -107,4 +107,23 @@ public void testGetBoolean() throws SFException {
 
     vector.close();
   }
+
+  @Test
+  public void testGetDate() throws SFException {
+    Map<String, String> customFieldMeta = new HashMap<>();
+    customFieldMeta.put("logicalType", "FIXED");
+
+    FieldType fieldType =
+            new FieldType(true, Types.MinorType.VARCHAR.getType(), null, customFieldMeta);
+
+    VarCharVector vector = new VarCharVector("col_one", fieldType, allocator);
+    vector.setNull(0);
+    vector.setSafe(1, "abc".getBytes(StandardCharsets.UTF_8));
+
+    ArrowVectorConverter converter = new VarCharConverter(vector, 0, this);
+    assertThat(null, is(converter.toDate(0, null, false)));
+    TestUtil.assertSFException(invalidConversionErrorCode, () -> converter.toDate(1, null, false));
+
+    vector.close();
+  }
 }