Merge branch 'main' into sql_testing_framework

Author: chernser

.github/workflows/analysis.yml

@@ -28,7 +28,7 @@ on:
         required: false
 
 env:
-  PREFERRED_LTS_VERSION: "24.3"
+  PREFERRED_LTS_VERSION: "25.3"
   PR_NUMBER: ${{ github.event.pull_request.number || '' }}
 
 jobs:

.github/workflows/benchmarks.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   CHC_BRANCH: "main"
-  CH_VERSION: "24.8"
+  CH_VERSION: "25.3"
   JAVA_VERSION: 17
 
 concurrency:

.github/workflows/build.yml

@@ -32,7 +32,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PREFERRED_LTS_VERSION: "24.3"
+  PREFERRED_LTS_VERSION: "25.3"
 
 jobs:
   compile:
@@ -57,53 +57,63 @@ 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      
-
-  test-multi-env:
-    needs: compile
-    strategy:
-      matrix:
-        # https://whichjdk.com/
-        # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#selecting-a-java-distribution
-        # add "corretto", "liberica", "microsoft", "zulu" only when needed
-        dist: ["temurin"]
-        # fix issue on "macos-latest", "windows-latest"
-        os: ["ubuntu-latest"]
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
-    name: ${{ matrix.dist }} JDK 17 on ${{ matrix.os }}
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      - name: Check out PR
-        run: |
-          git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
-            origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
-        if: github.event.inputs.pr != ''
-      - name: Install JDK 17 and Maven
-        uses: actions/setup-java@v4
-        with:
-          distribution: ${{ matrix.dist }}
-          java-version: 17
-          cache: "maven"
-      - name: Test libraries
-        run: mvn --batch-mode --no-transfer-progress -Dj8 -DskipITs verify
-      - name: Upload test results
+          done
+      - name: Save clickhouse-jdbc-all for tests 
         uses: actions/upload-artifact@v4
-        if: failure()
         with:
-          name: result ${{ github.job }}
-          path: |
-            **/target/failsafe-reports
-            **/target/surefire-reports
+          name: clickhouse-jdbc-archive
+          path: clickhouse-jdbc-artifacts/
+          retention-days: 5 
+
+#  test-multi-env:
+#    needs: compile
+#    strategy:
+#      matrix:
+#        # https://whichjdk.com/
+#        # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#selecting-a-java-distribution
+#        # add "corretto", "liberica", "microsoft", "zulu" only when needed
+#        dist: ["temurin"]
+#        # fix issue on "macos-latest", "windows-latest"
+#        os: ["ubuntu-latest"]
+#      fail-fast: false
+#    runs-on: ${{ matrix.os }}
+#    timeout-minutes: 10
+#    name: ${{ matrix.dist }} JDK 17 on ${{ matrix.os }}
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v4
+#      - name: Check out PR
+#        run: |
+#          git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
+#            origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
+#        if: github.event.inputs.pr != ''
+#      - name: Install JDK 17 and Maven
+#        uses: actions/setup-java@v4
+#        with:
+#          distribution: ${{ matrix.dist }}
+#          java-version: 17
+#          cache: "maven"
+#      - name: Test libraries
+#        run: mvn --batch-mode --no-transfer-progress -Dj8 -DskipITs verify
+#      - name: Upload test results
+#        uses: actions/upload-artifact@v4
+#        if: failure()
+#        with:
+#          name: result ${{ github.job }}
+#          path: |
+#            **/target/failsafe-reports
+#            **/target/surefire-reports
 
   test-native-image:
     runs-on: ubuntu-latest
@@ -122,8 +132,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1
         with:
           version: "latest"
-          java-version: "17"
-          components: "native-image"
+          java-version: "21"
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build native image
         run: mvn --batch-mode --no-transfer-progress -Pnative -Dj8 -DskipTests install
@@ -145,7 +154,7 @@ jobs:
       matrix:
         # most recent LTS releases as well as latest stable builds
         # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease
-        clickhouse: ["24.3", "24.8", "latest"]
+        clickhouse: ["25.3", "25.8", "latest"]
         project: ["clickhouse-http-client", "client-v2"]
       fail-fast: false
     timeout-minutes: 15
@@ -197,16 +206,18 @@ jobs:
           path: |
             **/target/failsafe-reports
             **/target/surefire-reports
+          retention-days: 5
 
   test-with-cloud:
     runs-on: ubuntu-latest
-    needs: compile
+    needs: test-jdbc-driver
     strategy:
       matrix:
         # most recent LTS releases as well as latest stable builds
         # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease
         clickhouse: ["cloud"]
-        project: ["clickhouse-http-client", "clickhouse-jdbc", "client-v2", "jdbc-v2"]
+#        project: ["clickhouse-http-client", "clickhouse-jdbc", "client-v2", "jdbc-v2"]
+        project: ["client-v2", "jdbc-v2"]
       fail-fast: false
     timeout-minutes: 20
     name: ${{ matrix.project }} + CH ${{ matrix.clickhouse }}
@@ -265,10 +276,10 @@ jobs:
 
   test-jdbc-driver:
     runs-on: ubuntu-latest
-    needs: compile
+    needs: test-java-client
     strategy:
       matrix:
-        clickhouse: ["24.3", "24.8", "latest"]
+        clickhouse: ["25.3", "25.8", "latest"]
         # here http, http_client and apache_http_client represent different value of http_connection_provider
 #        protocol: ["http", "http_client", "apache_http_client"]
         protocol: ["apache_http_client"]
@@ -328,10 +339,10 @@ jobs:
 
   test-r2dbc-driver:
     runs-on: ubuntu-latest
-    needs: compile
+    needs: test-jdbc-driver
     strategy:
       matrix:
-        clickhouse: ["24.3", "24.8", "latest"]
+        clickhouse: ["25.3", "25.8", "latest"]
         # grpc is not fully supported, and http_client and apache_http_client do not work in CI environment(due to limited threads?)
         protocol: ["http"]
         r2dbc: ["1.0.0.RELEASE", "0.9.1.RELEASE"]

.github/workflows/nightly.yml

@@ -13,7 +13,7 @@ on:
 env:
   CHC_BRANCH: "main"
   # CHC_VERSION: "0.9.0"
-  CH_VERSION: "24.8"
+  CH_VERSION: "25.3"
 
 jobs:
   nightly:

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
         required: true
 
 env:
-  CH_VERSION: "24.8"
+  CH_VERSION: "25.3"
 
 jobs:
   release:

.github/workflows/run_examples.yml

@@ -6,7 +6,7 @@ on:
       ch_version:
         description: ClickHouse Version
         required: false
-        default: 24.8
+        default: 25.8
       client_version:
         description: Build Type
         type: choice

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

@@ -136,6 +136,7 @@ public class Client implements AutoCloseable {
     private final Map<ClickHouseDataType, Class<?>> typeHintMapping;
 
     // Server context
+    private String dbUser;
     private String serverVersion;
     private Object metricsRegistry;
     private int retries;
@@ -196,7 +197,7 @@ private Client(Set<String> endpoints, Map<String,String> configuration,
         }
 
         this.serverVersion = configuration.getOrDefault(ClientConfigProperties.SERVER_VERSION.getKey(), "unknown");
-
+        this.dbUser = configuration.getOrDefault(ClientConfigProperties.USER.getKey(), ClientConfigProperties.USER.getDefObjVal());
         this.typeHintMapping = (Map<ClickHouseDataType, Class<?>>) this.configuration.get(ClientConfigProperties.TYPE_HINT_MAPPING.getKey());
     }
 
@@ -208,7 +209,10 @@ public void loadServerInfo() {
         try (QueryResponse response = this.query("SELECT currentUser() AS user, timezone() AS timezone, version() AS version LIMIT 1").get()) {
             try (ClickHouseBinaryFormatReader reader = this.newBinaryFormatReader(response)) {
                 if (reader.next() != null) {
-                    this.configuration.put(ClientConfigProperties.USER.getKey(), reader.getString("user"));
+                    String tmpDbUser = reader.getString("user");
+                    if (tmpDbUser != null && !tmpDbUser.isEmpty()) {
+                        this.dbUser = tmpDbUser;
+                    }
                     this.configuration.put(ClientConfigProperties.SERVER_TIMEZONE.getKey(), reader.getString("timezone"));
                     serverVersion = reader.getString("version");
                 }
@@ -766,6 +770,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;
         }
 
@@ -2039,7 +2045,7 @@ public Set<String> getEndpoints() {
     }
 
     public String getUser() {
-        return (String) this.configuration.get(ClientConfigProperties.USER.getKey());
+        return dbUser;
     }
 
     public String getServerVersion() {

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.