fixed code

Author: chernser

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

@@ -11,7 +11,6 @@
 import com.clickhouse.jdbc.internal.ExceptionUtils;
 import com.clickhouse.jdbc.internal.FeatureManager;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
-import com.clickhouse.jdbc.internal.JdbcUtils;
 import com.clickhouse.jdbc.internal.ParsedPreparedStatement;
 import com.clickhouse.jdbc.internal.SqlParser;
 import com.clickhouse.jdbc.metadata.DatabaseMetaDataImpl;
@@ -24,7 +23,6 @@
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.JDBCType;
 import java.sql.NClob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

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

@@ -801,11 +801,7 @@ private String encodeObject(Object x, Long length) throws SQLException {
             } else if (x instanceof java.sql.Array) {
                 com.clickhouse.jdbc.types.Array array = (com.clickhouse.jdbc.types.Array) x;
                 int nestedLevel = Math.max(1, array.getNestedLevel());
-                if (array.getBaseDataType() == ClickHouseDataType.Tuple) {
-                    return encodeTuple((Object[]) array.getArray());
-                } else {
-                    return encodeArray((Object[]) array.getArray(), Math.max(1, array.getNestedLevel()), array.getBaseDataType());
-                }
+                return encodeArray((Object[]) array.getArray(), nestedLevel, array.getBaseDataType());
             } else if (x instanceof Object[]) {
                 StringBuilder arrayString = new StringBuilder();
                 arrayString.append(O_BRACKET);
@@ -927,11 +923,16 @@ public String encodeArray(Object[] elements, int levels, ClickHouseDataType elem
                 }
                 arraySb.append(',');
                 cursor.pos++;
-            } else if (cursor.isTuples) {
+            } else if (cursor.arrayObjAsTuple) {
+                arraySb.append(encodeTuple((Object[]) ((Array)element).getArray())).append(',');
+                cursor.pos++;
+            } else if (cursor.arrayAsTuple) {
                 arraySb.append(encodeTuple((Object[]) element)).append(',');
                 cursor.pos++;
-            } else if (cursor.level == 1 && element.getClass().isArray() && elementType == ClickHouseDataType.Tuple) {
-                cursor.isTuples = true;
+            } else if (cursor.level == 1 && elementType == ClickHouseDataType.Tuple && element instanceof Array ) {
+               cursor.arrayObjAsTuple = true;
+            } else if (cursor.level == 1 && elementType == ClickHouseDataType.Tuple && element instanceof Object[] ) {
+               cursor.arrayAsTuple = true;
             } else if (cursor.level == 1) {
                 arraySb.append(encodeObject(element)).append(',');
                 cursor.pos++;
@@ -950,8 +951,8 @@ private static final class ArrayProcessingCursor {
         Object[] array; // current array
         int pos; // processing position
         int level;
-        boolean isTuples = false;
-        boolean isElements = false;
+        boolean arrayAsTuple = false;
+        boolean arrayObjAsTuple = false;
         public  ArrayProcessingCursor(Object[] array, int pos, int level) {
             this.array = array;
             this.pos = pos;
@@ -960,7 +961,8 @@ public  ArrayProcessingCursor(Object[] array, int pos, int level) {
     }
 
     private String encodeTuple(Object[] array) throws SQLException {
-        StringBuilder sb = new StringBuilder('(');
+        StringBuilder sb = new StringBuilder();
+        sb.append('(');
         if (array != null) {
             appendArrayElements(array, sb);
         }

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

@@ -380,18 +380,15 @@ public void testCreateArray() throws SQLException {
 
             final String baseType = "Tuple(String, Int8)";
             final String tableName = "array_create_test";
-            final String arrayType = "Array(Array(" + baseType + "))";
+            final String arrayType = "Array(" + baseType + ")";
             try (Statement stmt = conn.createStatement()) {
                 stmt.executeUpdate("CREATE TABLE " +tableName + " (v1 " + arrayType + ") ENGINE MergeTree ORDER BY ()");
 
 
                 Struct tuple1 = conn.createStruct(baseType, new Object[]{"v1", (byte)10});
                 Struct tuple2 = conn.createStruct(baseType, new Object[]{"v2", (byte)20});
 
-                Struct[][] srcArray = new Struct[][] {
-                        new  Struct[] { tuple1},
-                        new  Struct[] { tuple1, tuple2},
-                };
+                Struct[] srcArray = new Struct[] { tuple1, tuple2};
 
                 Array arrayValue = conn.createArrayOf("Tuple(String, Int8)", srcArray );
                 assertEquals(arrayValue.getBaseTypeName(), baseType);
@@ -427,8 +424,8 @@ public void testCreateArray() throws SQLException {
                     Assert.assertTrue(rs.next());
                     Array array1 = rs.getArray(1);
                     Object[] elements = (Object[]) array1.getArray();
-                    Object[] storedTuple1 = (Object[]) ((List<?>)elements[0]).get(0);
-                    Object[] storedTuple2 = (Object[]) ((List<?>)elements[1]).get(1);
+                    Object[] storedTuple1 = (Object[]) elements[0];
+                    Object[] storedTuple2 = (Object[]) elements[1];
                     Assert.assertEquals(storedTuple1, tuple1.getAttributes());
                     Assert.assertEquals(storedTuple2, tuple2.getAttributes());
 

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

@@ -918,7 +918,8 @@ public void testArrayTypes() throws SQLException {
             try (PreparedStatement stmt = conn.prepareStatement("INSERT INTO test_arrays VALUES ( 1, ?, ?, ?, ?)")) {
                 stmt.setArray(1, conn.createArrayOf("Int8", array));
                 stmt.setArray(2, conn.createArrayOf("String", arraystr));
-                stmt.setArray(3, conn.createArrayOf("Tuple", arraytuple));
+                stmt.setArray(3, conn.createArrayOf("Tuple(Int8, String)", arraytuple));
+                stmt.setArray(3, conn.createArrayOf("Tuple(Int8, String)", arraytuple));
                 stmt.setArray(4, conn.createArrayOf("Date", arraydate));
                 stmt.executeUpdate();
             }