Merge pull request #2042 from ClickHouse/add-primitive-array-type

add-encoding-for-array

Author: Paultagoras

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

@@ -532,6 +532,20 @@ private static String encodeObject(Object x) throws SQLException {
                     sb.append(new String(buffer, 0, len));
                 }
                 return "'" + escapeString(sb.toString()) + "'";
+            } else if (x instanceof Object[]) {
+                StringBuilder arrayString = new StringBuilder();
+                arrayString.append("[");
+                int i = 0;
+                for (Object item : (Object[]) x) {
+                    if (i > 0) {
+                        arrayString.append(", ");
+                    }
+                    arrayString.append(encodeObject(item));
+                    i++;
+                }
+                arrayString.append("]");
+
+                return arrayString.toString();
             }
 
             return escapeString(x.toString());//Escape single quotes
@@ -542,6 +556,6 @@ private static String encodeObject(Object x) throws SQLException {
     }
 
     private static String escapeString(String x) {
-        return x.replace("'", "''");//Escape single quotes
+        return x.replace("\\", "\\\\").replace("'", "\\'");//Escape single quotes
     }
 }

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

@@ -1,5 +1,6 @@
 package com.clickhouse.jdbc;
 
+import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
@@ -8,10 +9,12 @@
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.util.Arrays;
 import java.util.Calendar;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
@@ -222,4 +225,37 @@ public void testBigDecimal() throws Exception {
             }
         }
     }
+
+    @Test(groups = { "integration" })
+    public void testPrimitiveArrays() throws Exception {
+        try (Connection conn = getJdbcConnection()) {
+            try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
+                stmt.setObject(1, new String[][] {new String[]{"a"}, new String[]{"b"}, new String[]{"c"}});
+                try (ResultSet rs = stmt.executeQuery()) {
+                    assertTrue(rs.next());
+                    assertEquals(((BinaryStreamReader.ArrayValue)((BinaryStreamReader.ArrayValue)rs.getObject(1)).get(0)).get(0), "a");
+                    assertEquals(((BinaryStreamReader.ArrayValue)((BinaryStreamReader.ArrayValue)rs.getObject(1)).get(1)).get(0), "b");
+                    assertEquals(((BinaryStreamReader.ArrayValue)((BinaryStreamReader.ArrayValue)rs.getObject(1)).get(2)).get(0), "c");
+                    assertFalse(rs.next());
+                }
+            }
+        }
+    }
+
+
+    @Test(groups = { "integration" })
+    public void testEscapeStrings() throws Exception {
+        try (Connection conn = getJdbcConnection()) {
+            try (PreparedStatement stmt = conn.prepareStatement("SELECT FALSE OR ? = 'test', ?")) {
+                stmt.setString(1, "test\\' OR 1 = 1 --");
+                stmt.setString(2, "test\\\\' OR 1 = 1 --");
+                try (ResultSet rs = stmt.executeQuery()) {
+                    assertTrue(rs.next());
+                    assertEquals(rs.getString(1), "false");
+                    assertEquals(rs.getString(2), "test\\\\' OR 1 = 1 --");
+                    assertFalse(rs.next());
+                }
+            }
+        }
+    }
 }