Merge pull request #2508 from ClickHouse/fix_prepared_statement_impl

[jdbc] Fix prepared statement impl

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseDataType.java

@@ -4,6 +4,7 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
+import java.sql.SQLType;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -50,7 +51,7 @@
  * modifiers for the underlying base data types.
  */
 @SuppressWarnings("squid:S115")
-public enum ClickHouseDataType {
+public enum ClickHouseDataType implements SQLType {
     Bool(Boolean.class, false, false, true, 1, 1, 0, 0, 0, false,0x2D, "BOOLEAN"),
     Date(LocalDate.class, false, false, false, 2, 10, 0, 0, 0, false, 0x0F),
     Date32(LocalDate.class, false, false, false, 4, 10, 0, 0, 0, false, 0x10),
@@ -264,6 +265,21 @@ private static Set<Class<?>> setOf(Class<?>... args) {
 
     public static final byte TUPLE_WITH_NAMES_BIN_TAG = 0x20;
 
+    @Override
+    public String getName() {
+        return name();
+    }
+
+    @Override
+    public String getVendor() {
+        return "com.clickhouse";
+    }
+
+    @Override
+    public Integer getVendorTypeNumber() {
+        return (int) binTag;
+    }
+
     public enum IntervalKind {
         Nanosecond(IntervalNanosecond, ChronoUnit.NANOS, 0x00),
         Microsecond(IntervalMicrosecond, ChronoUnit.MICROS, 0x01),

client-v2/src/main/java/com/clickhouse/client/api/DataTypeUtils.java

@@ -20,17 +20,19 @@ public class DataTypeUtils {
     /**
      * Formatter for the DateTime type.
      */
-    public static DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss");
 
     /**
      * Formatter for the Date type.
      */
-    public static DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    public static DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu-MM-dd");
 
     /**
      * Formatter for the DateTime type with nanoseconds.
      */
-    public static DateTimeFormatter DATETIME_WITH_NANOS_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.nnnnnnnnn");
+    public static DateTimeFormatter DATETIME_WITH_NANOS_FORMATTER = new DateTimeFormatterBuilder().appendPattern("uuuu-MM-dd HH:mm:ss")
+            .appendFraction(ChronoField.NANO_OF_SECOND, 0, 9, true)
+            .toFormatter();
 
     private static final DateTimeFormatter INSTANT_FORMATTER = new DateTimeFormatterBuilder()
         .appendValue(ChronoField.INSTANT_SECONDS)

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

@@ -348,6 +348,8 @@ public static String readAsString(Object value, ClickHouseColumn column) {
                 case DateTime:
                 case DateTime32:
                     return zdt.format(DataTypeUtils.DATETIME_FORMATTER);
+                case DateTime64:
+                    return zdt.format(DataTypeUtils.DATETIME_WITH_NANOS_FORMATTER);
                 default:
                     return value.toString();
             }

client-v2/src/main/java/com/clickhouse/client/api/sql/SQLUtils.java

@@ -132,4 +132,8 @@ public static String unquoteIdentifier(String str) {
             return str;
         }
     }
+
+    public static String escapeSingleQuotes(String x) {
+            return x.replace("\\", "\\\\").replace("'", "\\'");//Escape single quotes
+    }
 }

jdbc-v2/src/main/java/com/clickhouse/data/Tuple.java

@@ -1,5 +1,7 @@
 package com.clickhouse.data;
 
+import java.util.Arrays;
+
 public class Tuple {
     private final Object[] values;
     private volatile String output;
@@ -37,4 +39,25 @@ public String toString() {
         }
         return output;
     }
+
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (obj instanceof Tuple) {
+            Tuple other = (Tuple) obj;
+            return Arrays.equals(values, other.values);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(values);
+    }
 }