fixed columnIndex check

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/ValueConverters.java

@@ -104,11 +104,11 @@ public ValueConverters() {
         stringMapBuilder.put(URL.class, this::convertStringToURL);
         mapBuilder.put(String.class, stringMapBuilder.build());
 
-        mapBuilder.put(java.sql.Date.class, ImmutableMap.of(java.sql.Date.class, this::conveSqlDateToSqlDate,
+        mapBuilder.put(java.sql.Date.class, ImmutableMap.of(java.sql.Date.class, this::convertSqlDateToSqlDate,
                 String.class, this::convertDateToString));
-        mapBuilder.put(Time.class, ImmutableMap.of(Time.class, this::conveSqlTimeToSqlTime,
+        mapBuilder.put(Time.class, ImmutableMap.of(Time.class, this::convertSqlTimeToSqlTime,
                 String.class, this::convertTimeToString));
-        mapBuilder.put(Timestamp.class, ImmutableMap.of(Timestamp.class, this::conveSqlTimestampToSqlTimestamp,
+        mapBuilder.put(Timestamp.class, ImmutableMap.of(Timestamp.class, this::convertSqlTimestampToSqlTimestamp,
                 String.class, this::convertTimestampToString));
 
         classConverters = mapBuilder.build();
@@ -214,15 +214,15 @@ public BigDecimal convertNumberToBigDecimal(Object value) {
     }
 
     // Date & Time converters
-    public java.sql.Date conveSqlDateToSqlDate(Object value) {
+    public java.sql.Date convertSqlDateToSqlDate(Object value) {
         return (java.sql.Date) value;
     }
 
-    public Time conveSqlTimeToSqlTime(Object value) {
+    public Time convertSqlTimeToSqlTime(Object value) {
         return (Time) value;
     }
 
-    public Timestamp conveSqlTimestampToSqlTimestamp(Object value) {
+    public Timestamp convertSqlTimestampToSqlTimestamp(Object value) {
         return (Timestamp) value;
     }
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java

@@ -18,7 +18,6 @@
 import java.sql.SQLException;
 import java.sql.SQLType;
 import java.sql.Time;
-import java.sql.Time;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;

jdbc-v2/src/main/java/com/clickhouse/jdbc/types/ArrayResultSet.java

@@ -55,12 +55,14 @@ public class ArrayResultSet implements ResultSet {
     private final ClickHouseDataType componentDataType;
     private final Class<?> defaultClass;
     private final ClickHouseColumn column;
+    private final int columnCount;
 
     public ArrayResultSet(Object array, ClickHouseColumn column) {
         this.array = array;
         this.length = java.lang.reflect.Array.getLength(array);
         this.pos = -1;
         this.column = column;
+        this.columnCount = 2; // INDEX, VALUE
 
         List<ClickHouseColumn> nestedColumns = column.getNestedColumns();
         ClickHouseColumn valueColumn = column.getArrayNestedLevel() == 1 ? column.getArrayBaseColumn() : nestedColumns.get(0);
@@ -71,7 +73,7 @@ public ArrayResultSet(Object array, ClickHouseColumn column) {
         this.defaultClass = JdbcUtils.DATA_TYPE_CLASS_MAP.get(componentDataType);
         ValueConverters converters = new ValueConverters();
         indexConverterMap = converters.getConvertersForType(Integer.class);
-        if (this.length > 1) {
+        if (this.length > 0) {
             Class<?> itemClass = array.getClass().getComponentType();
             if (itemClass == null) {
                 itemClass = java.lang.reflect.Array.get(array, 0).getClass();
@@ -93,7 +95,7 @@ public boolean next() throws SQLException {
     }
 
     private void checkColumnIndex(int columnIndex) throws SQLException {
-        if (columnIndex < 1 || columnIndex > length) {
+        if (columnIndex < 1 || columnIndex > columnCount) {
             throw new SQLException("Invalid column index: " + columnIndex);
         }
     }