Skip to content

Commit 0e690c8

Browse files
committed
Merge branch 'main' into jdbc_statement_2532
2 parents 1cc71a2 + 87db147 commit 0e690c8

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,24 @@ jobs:
5757
cache: "maven"
5858
- name: Build and install libraries
5959
run: mvn --batch-mode --no-transfer-progress --show-version --strict-checksums --threads 2 -Dmaven.wagon.rto=30000 -Dj8 -DskipITs install
60+
- name: Copy Artifacts to Build dir
61+
run: |
62+
mkdir clickhouse-jdbc-artifacts
63+
cp -rf $HOME/.m2/repository/com/clickhouse/clickhouse-jdbc/* ./clickhouse-jdbc-artifacts/
6064
- name: Compile examples
6165
run: |
6266
export LIB_VER=$(grep '<revision>' pom.xml | sed -e 's|[[:space:]]*<[/]*revision>[[:space:]]*||g')
6367
find `pwd`/examples -type f -name pom.xml -exec sed -i -e "s|\(<clickhouse-java.version>\).*\(<\)|\1$LIB_VER\2|g" {} \;
6468
for d in $(ls -d `pwd`/examples/*/); do \
6569
if [ -e $d/pom.xml ]; then cd $d && mvn --batch-mode --no-transfer-progress clean compile; fi;
6670
if [ -e $d/gradlew ]; then cd $d && ./gradlew clean build; fi;
67-
done
71+
done
72+
- name: Save clickhouse-jdbc-all for tests
73+
uses: actions/upload-artifact@v4
74+
with:
75+
name: clickhouse-jdbc-archive
76+
path: clickhouse-jdbc-artifacts/
77+
retention-days: 5
6878

6979
# test-multi-env:
7080
# needs: compile
@@ -196,6 +206,7 @@ jobs:
196206
path: |
197207
**/target/failsafe-reports
198208
**/target/surefire-reports
209+
retention-days: 5
199210

200211
test-with-cloud:
201212
runs-on: ubuntu-latest

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ public static void writeDateTime(OutputStream output, Object value, ZoneId targe
11431143
Instant dt = (Instant) value;
11441144
ts = dt.getEpochSecond();
11451145
} else {
1146-
throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
1146+
throw new IllegalArgumentException("Cannot convert " + value + " to DateTime");
11471147
}
11481148

11491149
BinaryStreamUtils.writeUnsignedInt32(output, ts);
@@ -1179,7 +1179,7 @@ public static void writeDateTime64(OutputStream output, Object value, int scale,
11791179
ts = dt.getEpochSecond();
11801180
nano = dt.getNano();
11811181
} else {
1182-
throw new IllegalArgumentException("Cannot convert " + value + " to DataTime");
1182+
throw new IllegalArgumentException("Cannot convert " + value + " to DateTime");
11831183
}
11841184

11851185
ts *= BinaryStreamReader.BASES[scale];

0 commit comments

Comments
 (0)