Merge branch 'main' into jdbc_various_fixes_091225

Author: chernser

.github/workflows/build.yml

@@ -57,14 +57,24 @@ jobs:
           cache: "maven"
       - name: Build and install libraries
         run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
+      - name: Copy Artifacts to Build dir
+        run: |
+          mkdir clickhouse-jdbc-artifacts
+          cp -rf $HOME/.m2/repository/com/clickhouse/clickhouse-jdbc/* ./clickhouse-jdbc-artifacts/
       - name: Compile examples
         run: |
           export LIB_VER=$(grep '<revision>' pom.xml | sed -e 's|[[:space:]]*<[/]*revision>[[:space:]]*||g')
           find `pwd`/examples -type f -name pom.xml -exec sed -i -e "s|\(<clickhouse-java.version>\).*\(<\)|\1$LIB_VER\2|g" {} \;
           for d in $(ls -d `pwd`/examples/*/); do \
             if [ -e $d/pom.xml ]; then cd $d && mvn  --batch-mode --no-transfer-progress clean compile; fi;
             if [ -e $d/gradlew ]; then cd $d && ./gradlew clean build; fi;
-          done      
+          done
+      - name: Save clickhouse-jdbc-all for tests 
+        uses: actions/upload-artifact@v4
+        with:
+          name: clickhouse-jdbc-archive
+          path: clickhouse-jdbc-artifacts/
+          retention-days: 5 
 
 #  test-multi-env:
 #    needs: compile
@@ -196,6 +206,7 @@ jobs:
           path: |
             **/target/failsafe-reports
             **/target/surefire-reports
+          retention-days: 5
 
   test-with-cloud:
     runs-on: ubuntu-latest

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDriverTest.java

@@ -1,16 +1,13 @@
 package com.clickhouse.jdbc;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-
 import com.clickhouse.client.ClickHouseProtocol;
-
 import com.clickhouse.client.ClickHouseServerForTest;
-import com.clickhouse.client.config.ClickHouseDefaults;
-import com.clickhouse.jdbc.internal.ClickHouseJdbcUrlParser;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 public class ClickHouseDriverTest extends JdbcIntegrationTest {
     @Test(groups = "integration")
     public void testAcceptUrl() throws SQLException {
@@ -24,13 +21,21 @@ public void testAcceptUrl() throws SQLException {
 
     @Test(groups = "integration")
     public void testConnect() throws SQLException {
-        if (isCloud()) return; //TODO: testConnect - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
+        if (isCloud())  {
+            return; //
+        }
+
         System.setProperty("clickhouse.jdbc.v1","true");
         String address = getServerAddress(ClickHouseProtocol.HTTP, true);
         ClickHouseDriver driver = new ClickHouseDriver();
         Connection conn = driver.connect("jdbc:clickhouse://default:" + ClickHouseServerForTest.getPassword() + "@" + address, null);
         conn.close();
+        System.setProperty("clickhouse.jdbc.v1","false");
+        ClickHouseDriver driver2 = new ClickHouseDriver();
+        Connection conn2 = driver2.connect("jdbc:clickhouse://default:" + ClickHouseServerForTest.getPassword() + "@" + address, null);
+        conn2.close();
     }
+
     @Test(groups = "integration")
     public void testV2Driver() {
         System.setProperty("clickhouse.jdbc.v1","false");

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

@@ -52,6 +52,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.ServiceLoader;
 import java.util.TimeZone;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;

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

@@ -766,6 +766,8 @@ public Builder useServerTimeZone(boolean useServerTimeZone) {
          */
         public Builder useTimeZone(String timeZone) {
             this.configuration.put(ClientConfigProperties.USE_TIMEZONE.getKey(), timeZone);
+            // switch using server timezone to false
+            this.configuration.put(ClientConfigProperties.USE_SERVER_TIMEZONE.getKey(), String.valueOf(Boolean.FALSE));
             return this;
         }
 

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

@@ -1,8 +1,7 @@
 package com.clickhouse.client.api;
 
-import java.time.Instant;
-import java.time.ZoneId;
 import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
+import com.clickhouse.data.ClickHouseDataType;
 
 import java.time.Instant;
 import java.time.ZoneId;
@@ -11,8 +10,6 @@
 import java.time.temporal.ChronoField;
 import java.util.Objects;
 
-import com.clickhouse.data.ClickHouseDataType;
-
 import static com.clickhouse.client.api.data_formats.internal.BinaryStreamReader.BASES;
 
 public class DataTypeUtils {
@@ -39,6 +36,10 @@ public class DataTypeUtils {
         .appendFraction(ChronoField.NANO_OF_SECOND, 9, 9, true)
         .toFormatter();
 
+    public static final DateTimeFormatter TIME_WITH_NANOS_FORMATTER = INSTANT_FORMATTER;
+
+    public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss");
+
     /**
      * Formats an {@link Instant} object for use in SQL statements or as query
      * parameter.

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

@@ -4,6 +4,7 @@
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.DataTypeUtils;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
+import com.clickhouse.client.api.internal.DataTypeConverter;
 import com.clickhouse.client.api.internal.MapUtils;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.metadata.NoSuchColumnException;
@@ -61,6 +62,8 @@ public abstract class AbstractBinaryFormatReader implements ClickHouseBinaryForm
 
     protected BinaryStreamReader binaryStreamReader;
 
+    protected DataTypeConverter dataTypeConverter;
+
     private TableSchema schema;
     private ClickHouseColumn[] columns;
     private Map[] convertions;
@@ -84,6 +87,7 @@ protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings quer
         if (schema != null) {
             setSchema(schema);
         }
+        this.dataTypeConverter = DataTypeConverter.INSTANCE; // singleton while no need to customize conversion
     }
 
     protected Object[] currentRecord;
@@ -326,52 +330,7 @@ public TableSchema getSchema() {
 
     @Override
     public String getString(String colName) {
-        return readAsString(readValue(colName), schema.getColumnByName(colName));
-    }
-
-    /**
-     * Converts value in to a string representation. Does some formatting for selected data types
-     * @return string representation of a value for specified column
-     */
-    public static String readAsString(Object value, ClickHouseColumn column) {
-        if (value == null) {
-            return null;
-        } else if (value instanceof String) {
-            return (String) value;
-        } else if (value instanceof ZonedDateTime) {
-            ClickHouseDataType dataType = column.getDataType();
-            ZonedDateTime zdt = (ZonedDateTime) value;
-            switch (dataType) { // should not be null
-                case Date:
-                case Date32:
-                    return zdt.format(DataTypeUtils.DATE_FORMATTER);
-                case DateTime:
-                case DateTime32:
-                    return zdt.format(DataTypeUtils.DATETIME_FORMATTER);
-                case DateTime64:
-                    return zdt.format(DataTypeUtils.DATETIME_WITH_NANOS_FORMATTER);
-                default:
-                    return value.toString();
-            }
-        } else if (value instanceof BinaryStreamReader.EnumValue) {
-            return ((BinaryStreamReader.EnumValue)value).name;
-        } else if (value instanceof Number ) {
-            ClickHouseDataType dataType = column.getDataType();
-            int num = ((Number) value).intValue();
-            if (column.getDataType() == ClickHouseDataType.Variant) {
-                for (ClickHouseColumn c : column.getNestedColumns()) {
-                    // TODO: will work only if single enum listed as variant
-                    if (c.getDataType() == ClickHouseDataType.Enum8 || c.getDataType() == ClickHouseDataType.Enum16) {
-                        return c.getEnumConstants().name(num);
-                    }
-                }
-            } else if (dataType == ClickHouseDataType.Enum8 || dataType == ClickHouseDataType.Enum16) {
-                return column.getEnumConstants().name(num);
-            }
-        } else if (value instanceof BinaryStreamReader.ArrayValue) {
-            return ((BinaryStreamReader.ArrayValue)value).asList().toString();
-        }
-        return value.toString();
+        return dataTypeConverter.convertToString(readValue(colName), schema.getColumnByName(colName));
     }
 
     @Override

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

@@ -2,6 +2,7 @@
 
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.DataTypeUtils;
+import com.clickhouse.client.api.internal.DataTypeConverter;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.NullValueException;
@@ -38,10 +39,13 @@ public class MapBackedRecord implements GenericRecord {
 
     private Map[] columnConverters;
 
+    private DataTypeConverter dataTypeConverter;
+
     public MapBackedRecord(Map<String, Object> record, Map[] columnConverters, TableSchema schema) {
         this.record = new HashMap<>(record);
         this.schema = schema;
         this.columnConverters = columnConverters;
+        this.dataTypeConverter = DataTypeConverter.INSTANCE;
     }
 
     public <T> T readValue(int colIndex) {
@@ -58,7 +62,7 @@ public <T> T readValue(String colName) {
 
     @Override
     public String getString(String colName) {
-        return AbstractBinaryFormatReader.readAsString(readValue(colName), schema.getColumnByName(colName));
+        return dataTypeConverter.convertToString(readValue(colName), schema.getColumnByName(colName));
     }
 
     @Override

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

@@ -1143,7 +1143,7 @@ public static void writeDateTime(OutputStream output, Object value, ZoneId targe
             Instant dt = (Instant) value;
             ts = dt.getEpochSecond();
         } else {
-            throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
+            throw new IllegalArgumentException("Cannot convert " + value + " to DateTime");
         }
 
         BinaryStreamUtils.writeUnsignedInt32(output, ts);
@@ -1179,7 +1179,7 @@ public static void writeDateTime64(OutputStream output, Object value, int scale,
             ts = dt.getEpochSecond();
             nano = dt.getNano();
         } else {
-            throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
+            throw new IllegalArgumentException("Cannot convert " + value + " to DateTime");
         }
 
         ts *= BinaryStreamReader.BASES[scale];