Merge pull request #1781 from BeenAxis/main

[client-v2] Fix: null TimeZone Exception
ClickHouse · Aug 21, 2024 · 4fefbb9 · 4fefbb9
2 parents fc8d92e + 1a091dc
commit 4fefbb9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java b/...-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java
@@ -130,7 +130,8 @@ private <T> T readValueImpl(ClickHouseColumn column) throws IOException {
                     return (T) readDateTime32(input, column.getTimeZone() == null ? timeZone:
                             column.getTimeZone());
                 case DateTime64:
-                    return (T) readDateTime64(input, 3, column.getTimeZone());
+                    return (T) readDateTime64(input, 3, column.getTimeZone() == null ? timeZone:
+                            column.getTimeZone());
 
                 case IntervalYear:
                 case IntervalQuarter: