added more test. fixed dead code when instanceof Object[] was after if array branch

Author: chernser

jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java

@@ -793,6 +793,12 @@ private String encodeObject(Object x, Long length) throws SQLException {
                 listString.append(']');
 
                 return listString.toString();
+            } else if (x instanceof Object[]) {
+                StringBuilder arrayString = new StringBuilder();
+                arrayString.append('[');
+                appendArrayElements((Object[]) x, arrayString);
+                arrayString.append(']');
+                return arrayString.toString();
             } else if (x.getClass().isArray()) {
                 StringBuilder listString = new StringBuilder();
                 listString.append('[');
@@ -841,12 +847,6 @@ private String encodeObject(Object x, Long length) throws SQLException {
                 return encodeCharacterStream((Reader) x, length);
             } else if (x instanceof InputStream) {
                 return encodeCharacterStream((InputStream) x, length);
-            } else if (x instanceof Object[]) {
-                StringBuilder arrayString = new StringBuilder();
-                arrayString.append('[');
-                appendArrayElements((Object[]) x, arrayString);
-                arrayString.append(']');
-                return arrayString.toString();
             } else if (x instanceof Tuple) {
                 return arrayToTuple(((Tuple)x).getValues());
             } else if (x instanceof Struct) {

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

@@ -276,6 +276,16 @@ public void testPrimitiveArrays() throws Exception {
                     assertFalse(rs.next());
                 }
             }
+
+            try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
+                stmt.setObject(1, new Object[] {1, 2, 3});
+                try (ResultSet rs = stmt.executeQuery()) {
+                    assertTrue(rs.next());
+                    Array a1 = rs.getArray(1);
+                    assertNotNull(a1);
+                    assertEquals(Arrays.deepToString((Object[]) a1.getArray()), "[1, 2, 3]");
+                }
+            }
         }
     }
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcUtilsTest.java

@@ -1,13 +1,18 @@
 package com.clickhouse.jdbc.internal;
 
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
+import com.clickhouse.client.api.data_formats.internal.InetAddressConverter;
 import com.clickhouse.data.ClickHouseColumn;
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
+import java.net.Inet6Address;
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
 
 public class JdbcUtilsTest {
 
@@ -40,4 +45,39 @@ public void testConvertToArray() throws Exception {
         assertEquals(arrs[0], 1);
         assertEquals(arrs[1], 2);
     }
+
+
+    @Test(groups = {"unit"})
+    public void testConvertArray() throws Exception {
+        Object[] src = {1, 2, 3};
+        Object[] dst = JdbcUtils.convertArray(src, int.class);
+        assertEquals(dst.length, src.length);
+        assertEquals(dst[0], src[0]);
+        assertEquals(dst[1], src[1]);
+        assertEquals(dst[2], src[2]);
+
+        assertNull(JdbcUtils.convertArray(null, int.class));
+        assertEquals(JdbcUtils.convertArray(new Integer[] { 1, 2}, null), new Integer[] { 1, 2});
+    }
+
+
+    @Test(groups = {"unit"})
+    public void testConvertList() throws Exception {
+        ClickHouseColumn column = ClickHouseColumn.of("arr", "Array(Int32)");
+        List<Integer> src = Arrays.asList(1, 2, 3);
+        Object[] dst = JdbcUtils.convertList(src, Integer.class);
+        assertEquals(dst.length, src.size());
+        assertEquals(dst[0], src.get(0));
+        assertEquals(dst[1], src.get(1));
+        assertEquals(dst[2], src.get(2));
+
+        assertNull(JdbcUtils.convertList(null, Integer.class));
+    }
+
+
+    @Test(groups = {"unit"})
+    public void testConvertToInetAddress() throws Exception {
+        ClickHouseColumn column = ClickHouseColumn.of("ip", "IPv4");
+        assertEquals(JdbcUtils.convert(java.net.InetAddress.getByName("192.168.0.1"), java.net.Inet6Address.class, column).toString(), "/0:0:0:0:0:ffff:c0a8:1");
+    }
 }