Skip to content

Commit a5f33d3

Browse files
committed
fixed deps
1 parent cf6d4cc commit a5f33d3

File tree

2 files changed

+63
-55
lines changed

2 files changed

+63
-55
lines changed

.github/workflows/build.yml

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ jobs:
316316
</toolchains>
317317
EOF
318318
- name: Install Java client
319-
run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client -DskipTests install
319+
run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client,client-v2 -DskipTests install
320320
- name: Test JDBC driver
321321
env:
322322
CLICKHOUSE_CLOUD_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
@@ -393,56 +393,56 @@ jobs:
393393
**/target/failsafe-reports
394394
**/target/surefire-reports
395395
396-
test-timezone-support:
397-
runs-on: ubuntu-latest
398-
needs: compile
399-
strategy:
400-
matrix:
401-
serverTz:
402-
[
403-
"Asia/Chongqing",
404-
"America/Los_Angeles",
405-
"Etc/UTC",
406-
"Europe/Berlin",
407-
"Europe/Moscow",
408-
]
409-
clientTz:
410-
[
411-
"Asia/Chongqing",
412-
"America/Los_Angeles",
413-
"Etc/UTC",
414-
"Europe/Berlin",
415-
"Europe/Moscow",
416-
]
417-
fail-fast: false
418-
timeout-minutes: 20
419-
name: "TimeZone(C/S): ${{ matrix.clientTz }} vs. ${{ matrix.serverTz }}"
420-
steps:
421-
- name: Check out repository
422-
uses: actions/checkout@v4
423-
- name: Check out PR
424-
run: |
425-
git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
426-
origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
427-
if: github.event.inputs.pr != ''
428-
- name: Install JDK 8 and Maven
429-
uses: actions/setup-java@v4
430-
with:
431-
distribution: "temurin"
432-
java-version: 8
433-
cache: "maven"
434-
- name: Install Java client
435-
run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client -Dj8 -DskipTests install
436-
- name: Test JDBC and R2DBC drivers
437-
run: |
438-
mvn --batch-mode --no-transfer-progress --projects clickhouse-jdbc,clickhouse-r2dbc -DclickhouseVersion=$PREFERRED_LTS_VERSION \
439-
-DclickhouseTimezone=${{ matrix.serverTz }} -Duser.timezone=${{ matrix.clientTz }} \
440-
-Dj8 -DskipUTs verify
441-
- name: Upload test results
442-
uses: actions/upload-artifact@v4
443-
if: failure()
444-
with:
445-
name: result ${{ github.job }}
446-
path: |
447-
**/target/failsafe-reports
448-
**/target/surefire-reports
396+
# test-timezone-support:
397+
# runs-on: ubuntu-latest
398+
# needs: compile
399+
# strategy:
400+
# matrix:
401+
# serverTz:
402+
# [
403+
# "Asia/Chongqing",
404+
# "America/Los_Angeles",
405+
# "Etc/UTC",
406+
# "Europe/Berlin",
407+
# "Europe/Moscow",
408+
# ]
409+
# clientTz:
410+
# [
411+
# "Asia/Chongqing",
412+
# "America/Los_Angeles",
413+
# "Etc/UTC",
414+
# "Europe/Berlin",
415+
# "Europe/Moscow",
416+
# ]
417+
# fail-fast: false
418+
# timeout-minutes: 20
419+
# name: "TimeZone(C/S): ${{ matrix.clientTz }} vs. ${{ matrix.serverTz }}"
420+
# steps:
421+
# - name: Check out repository
422+
# uses: actions/checkout@v4
423+
# - name: Check out PR
424+
# run: |
425+
# git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
426+
# origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
427+
# if: github.event.inputs.pr != ''
428+
# - name: Install JDK 8 and Maven
429+
# uses: actions/setup-java@v4
430+
# with:
431+
# distribution: "temurin"
432+
# java-version: 8
433+
# cache: "maven"
434+
# - name: Install Java client
435+
# run: mvn --also-make --batch-mode --no-transfer-progress --projects clickhouse-http-client -Dj8 -DskipTests install
436+
# - name: Test JDBC and R2DBC drivers
437+
# run: |
438+
# mvn --batch-mode --no-transfer-progress --projects clickhouse-jdbc,clickhouse-r2dbc -DclickhouseVersion=$PREFERRED_LTS_VERSION \
439+
# -DclickhouseTimezone=${{ matrix.serverTz }} -Duser.timezone=${{ matrix.clientTz }} \
440+
# -Dj8 -DskipUTs verify
441+
# - name: Upload test results
442+
# uses: actions/upload-artifact@v4
443+
# if: failure()
444+
# with:
445+
# name: result ${{ github.job }}
446+
# path: |
447+
# **/target/failsafe-reports
448+
# **/target/surefire-reports

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.clickhouse.client.BaseIntegrationTest;
66
import com.clickhouse.client.ClickHouseProtocol;
7+
import com.clickhouse.client.api.ClientConfigProperties;
78
import com.clickhouse.client.api.query.GenericRecord;
89
import com.clickhouse.logging.Logger;
910
import com.clickhouse.logging.LoggerFactory;
@@ -32,11 +33,18 @@ public Connection getJdbcConnection(Properties properties) throws SQLException {
3233
Properties info = new Properties();
3334
info.setProperty("user", "default");
3435
info.setProperty("password", ClickHouseServerForTest.getPassword());
35-
LOGGER.info("Connecting to {}", getEndpointString());
36+
if (info.getProperty(ClientConfigProperties.PASSWORD.getKey()).isEmpty()) {
37+
LOGGER.error("password is empty!!");
38+
}
39+
LOGGER.info("Connecting to " + getEndpointString() + " database: " + ClickHouseServerForTest.getDatabase() );
3640
if (properties != null) {
3741
info.putAll(properties);
3842
}
3943

44+
if (isCloud()) {
45+
info.setProperty(ClientConfigProperties.DATABASE.getKey(), ClickHouseServerForTest.getDatabase());
46+
}
47+
4048
return new ConnectionImpl(getEndpointString(), info);
4149
//return DriverManager.getConnection(getEndpointString(), "default", ClickHouseServerForTest.getPassword());
4250
}

0 commit comments

Comments
 (0)