Add support for datetime type conversion in JDBC

Signed-off-by: Guian Gumpac <[email protected]>
opensearch-project · Nov 8, 2021 · 8c4b8f2 · 8c4b8f2
1 parent a2037bc
commit 8c4b8f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ResultSetImpl.java
@@ -595,8 +595,11 @@ protected <T> T getObjectX(int columnIndex, Class<T> javaClass) throws SQLExcept
     }
 
     protected <T> T getObjectX(int columnIndex, Class<T> javaClass, Map<String, Object> conversionParams) throws SQLException {
-        Object value = getColumn(columnIndex);
-        TypeConverter tc = TypeConverters.getInstance(getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType());
+        final Object value = getColumn(columnIndex);
+        final TypeConverter tc = TypeConverters.getInstance(getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType());
+        if (null == tc) {
+            throw new SQLException("Conversion from " + getColumnMetaData(columnIndex).getOpenSearchType() + " not supported.");
+        }
         return tc.convert(value, javaClass, conversionParams);
     }
 

diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/types/OpenSearchType.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/types/OpenSearchType.java
@@ -85,6 +85,7 @@ public enum OpenSearchType {
     OBJECT(JDBCType.STRUCT, null, 0, 0, false),
     DATE(JDBCType.DATE, Date.class, 24, 24, false),
     TIME(JDBCType.TIME, Time.class, 24, 24, false),
+    DATETIME(JDBCType.TIMESTAMP, Timestamp.class, 24, 24, false),
     TIMESTAMP(JDBCType.TIMESTAMP, Timestamp.class, 24, 24, false),
     BINARY(JDBCType.VARBINARY, String.class, Integer.MAX_VALUE, 0, false),
     NULL(JDBCType.NULL, null, 0, 0, false),