Merge branch 'main' into jdbc_fix_date_problem

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:
@@ -84,6 +84,7 @@ jobs:
             clickhouse-data/target/clickhouse*.jar
             clickhouse-http-client/target/clickhouse*.jar
             clickhouse-jdbc/target/clickhouse*.jar
+            clickhouse-jdbc/target/bundle/clickhouse*.jar
             clickhouse-r2dbc/target/clickhouse*.jar
             client-v2/target/client-v2*.jar
             jdbc-v2/target/jdbc-v2*.jar

.github/workflows/run_examples.yml

@@ -6,17 +6,17 @@ on:
       ch_version:
         description: ClickHouse Version
         required: false
-        default: 24.8
+        default: 25.8
       client_version:
-        description: ClickHouse Java Version
+        description: Build Type
         type: choice
         options:
-          - latest
-          - pre_release
-      pre_release_version:
-        description: Client Release Version
+          - head
+          - nightly
+      nightly_version:
+        description: Nightly Version
         required: false
-        default: 0.9.0
+        default: 0.9.2-SNAPSHOT
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}
@@ -25,7 +25,7 @@ concurrency:
 
 jobs:
   run-examples-with-8-jdk-and-latest:
-    if: github.event.inputs.client_version == 'latest'
+    if: github.event.inputs.client_version == 'head'
     runs-on: ubuntu-latest
     timeout-minutes: 15
     name: Run Examples With HEAD on JVM 8
@@ -56,7 +56,7 @@ jobs:
           mvn --batch-mode --no-transfer-progress --show-version clean compile
           mvn --no-transfer-progress exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic" -DchPassword=secret -DfailOnError=true
   run-examples-with-8-jdk-and-staging-release:
-    if: github.event.inputs.client_version == 'pre_release'
+    if: github.event.inputs.client_version == 'nightly'
     runs-on: ubuntu-latest
     timeout-minutes: 15
     name: Run Examples With Pre-Release on JVM 8
@@ -69,12 +69,11 @@ jobs:
           distribution: "temurin"
           java-version: 8
           cache: "maven"
-      - name: Run Examples
+      - name: Run JDBC Example
         run: |
           java -version
           docker run -d -q --name demo-service-db -e CLICKHOUSE_USER=default -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1 -e CLICKHOUSE_PASSWORD=secret -p 8123:8123 clickhouse/clickhouse-server:${{ github.event.inputs.ch_version }}
           cd examples/jdbc
-          sed -i "s|<clickhouse-java.version>.*<\/clickhouse-java.version>|<clickhouse-java.version>${{ github.event.inputs.pre_release_version }}<\/clickhouse-java.version>|g" pom.xml
-          sed -i "s|<url>https:\/\/s01\.oss\.sonatype\.org\/content\/repositories\/snapshots\/<\/url>|<url>https:\/\/s01\.oss\.sonatype\.org\/content\/groups\/staging\/<\/url>|g" pom.xml
+          sed -i "s|<clickhouse-java.version>.*<\/clickhouse-java.version>|<clickhouse-java.version>${{ github.event.inputs.nightly_version }}<\/clickhouse-java.version>|g" pom.xml
           mvn --batch-mode --no-transfer-progress --show-version clean compile
           mvn --no-transfer-progress exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic" -DchPassword=secret -DfailOnError=true

CHANGELOG.md

@@ -1,3 +1,36 @@
+## 0.9.2 
+
+### Improvements 
+- [jdbc-v2] `ResultSetImpl.getObject()` handles `java.time.Instant`
+
+### Improvements 
+- [jdbc-v2] Classes `com.clickhouse.jdbc.ClientInfoProperties` and `com.clickhouse.jdbc.DriverProperties` moved to public 
+API. (https://github.com/ClickHouse/clickhouse-java/pull/2521)
+- [jdbc-v2] Implemented `isBeforeFirst`, `isAfterLast`, `isFirst`, `isLast` methods for `ResultSet` and `ResultSetMetaData`.
+Improved test coverage for `ResultSetImpl`. (https://github.com/ClickHouse/clickhouse-java/pull/2530)
+- [jdbc-v2] Implemented `createArray` and `createStruct` methods for `Connection` interface. Method `createStruct`
+should be used to create `Tuple` values and `createArray` to create various arrays. (https://github.com/ClickHouse/clickhouse-java/pull/2523)
+- [jdbc-v2] Implemented `setNetworkTimeout` of `Connection` interface. Used to fail fast when network operation fails. Related to
+stale connection problem. (https://github.com/ClickHouse/clickhouse-java/pull/2522)
+- [client-v2] Added support for JSON with predefined paths. Previously columns with definition like `JSON(a string, b.c Int32)`
+were not supported. (https://github.com/ClickHouse/clickhouse-java/pull/2531)
+
+### Bug Fixes
+- [jdbc-v2] Fixed issue creating array of tuples with `createArray` method of `Connection` interface. 
+(https://github.com/ClickHouse/clickhouse-java/issues/2360)
+- [jdbc-v2] Fixed issue with reading nested arrays. (https://github.com/ClickHouse/clickhouse-java/issues/2539)
+- [jdbc-v2] Fixed issue with not shaded antlr4-runtime dependency. Potential problem for Apache Spark users. (https://github.com/ClickHouse/clickhouse-java/issues/2553)
+- [jdbc-v2] Fixed issue with parsing CTE for prepared statement. (https://github.com/ClickHouse/clickhouse-java/issues/2551)
+- [jdbc-v2] Fixed issue with parsing SQL containing view parameters. (https://github.com/ClickHouse/clickhouse-java/issues/2547)
+- [jdbc-v2] Fixed issue with `InsertSettings` when two concurrent insert operations sharing same settings object may be insert 
+wrong columns or to a wrong table. (https://github.com/ClickHouse/clickhouse-java/pull/2550)
+- [jdbc-v2] Fixed issue with batch insert when it is not cleared after execution. Now batch is cleared after execution even on failure. (https://github.com/ClickHouse/clickhouse-java/issues/2548)
+- [jdbc-v2] Fixed `DatabaseMetadataImpl` to return result set with defined by spec structure. Resolves issue for many database tools
+relying on metadata. (https://github.com/ClickHouse/clickhouse-java/issues/2396)
+- [jdbc-v2] Fixed `DatabaseMetadataImpl` to return empty result set where appropriate. (https://github.com/ClickHouse/clickhouse-java/issues/2517)
+- [jdbc-v2] Fixed issue with verbose logging. (https://github.com/ClickHouse/clickhouse-java/issues/2148)
+- [client-v2] Fixed issue with reading JSON with predefined paths. (https://github.com/ClickHouse/clickhouse-java/issues/2462)
+
 ## 0.9.1
 
 ### New Features

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

@@ -639,6 +639,41 @@ public static ClickHouseColumn of(String columnName, String columnType) {
         return list.get(0);
     }
 
+    public static ClickHouseColumn of(ClickHouseDataType dataType) {
+        return ClickHouseColumn.of(dataType, false);
+    }
+
+    public static ClickHouseColumn of(ClickHouseDataType dataType, boolean nullable) {
+        return ClickHouseColumn.of("", dataType, nullable);
+    }
+
+    public static ClickHouseColumn nullable(ClickHouseDataType dataType) {
+        return ClickHouseColumn.of(dataType, true);
+    }
+
+    public static ClickHouseColumn string(boolean nullable) {
+        return ClickHouseColumn.of(ClickHouseDataType.String, nullable);
+    }
+
+    public static ClickHouseColumn string() {
+        return ClickHouseColumn.of(ClickHouseDataType.String, false);
+    }
+
+    public static ClickHouseColumn array(String columnName, boolean nullable, ClickHouseColumn innerColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Array, nullable, innerColumn);
+    }
+
+    public static ClickHouseColumn map(String columnName, boolean nullable, ClickHouseDataType keyColumn, ClickHouseColumn valueColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Map, nullable,
+                ClickHouseColumn.of(keyColumn),
+                valueColumn);
+    }
+
+    public static ClickHouseColumn tuple(String columnName, boolean nullable, ClickHouseColumn... innerColumn) {
+        return ClickHouseColumn.of(columnName, ClickHouseDataType.Tuple, nullable, innerColumn);
+    }
+
+
     public static List<ClickHouseColumn> parse(String args) {
         if (args == null || args.isEmpty()) {
             return Collections.emptyList();