fix after merge

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1137,7 +1137,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         metrics.setQueryId(queryId);
                         metrics.operationComplete();
 
-                        return new QueryResponse(httpResponse, finalSettings.getFormat(), metrics);
+                        return new QueryResponse(httpResponse, finalSettings.getFormat(), finalSettings, metrics);
                     } catch (ClientException e) {
                         throw e;
                     } catch (Exception e) {
@@ -1169,7 +1169,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
                         clickHouseResponse = request.execute().get();
                     }
 
-                    return new QueryResponse(clickHouseResponse, format, clientStats);
+                    return new QueryResponse(clickHouseResponse, format, clientStats, finalSettings);
                 } catch (ClientException e) {
                     throw e;
                 } catch (Exception e) {

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

@@ -56,8 +56,7 @@ public abstract class AbstractBinaryFormatReader implements ClickHouseBinaryForm
     protected AbstractBinaryFormatReader(InputStream inputStream, QuerySettings querySettings, TableSchema schema) {
         this.input = inputStream;
         this.settings = querySettings == null ? Collections.emptyMap() : new HashMap<>(querySettings.getAllSettings());
-        boolean useServerTimeZone = (boolean) this.settings.getOrDefault(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey(),
-                 false);
+        boolean useServerTimeZone = (boolean) this.settings.get(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey());
         TimeZone timeZone = useServerTimeZone ? querySettings.getServerTimeZone() :
                 (TimeZone) this.settings.get(ClickHouseClientOption.USE_TIME_ZONE.getKey());
         if (timeZone == null) {

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

@@ -153,6 +153,7 @@ public static Map<String, ClickHouseOption> createMapOfRequestOptions() {
                         ClickHouseClientOption.USE_OBJECTS_IN_ARRAYS,
                         ClickHouseClientOption.USE_SERVER_TIME_ZONE,
                         ClickHouseClientOption.USE_SERVER_TIME_ZONE_FOR_DATES,
+                        ClickHouseClientOption.SERVER_TIME_ZONE,
                         ClickHouseClientOption.USE_TIME_ZONE)
                 .forEach(option -> map.put(option.getKey(), option));
 

client-v2/src/main/java/com/clickhouse/client/api/query/QueryResponse.java

@@ -6,6 +6,7 @@
 import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
+import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.http.ClickHouseHttpProto;
 import com.clickhouse.data.ClickHouseFormat;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -40,27 +41,31 @@ public class QueryResponse implements AutoCloseable {
 
     @Deprecated
     public QueryResponse(ClickHouseResponse clickHouseResponse, ClickHouseFormat format,
-                         ClientStatisticsHolder clientStatisticsHolder) {
+                         ClientStatisticsHolder clientStatisticsHolder, QuerySettings settings) {
         this.clickHouseResponse = clickHouseResponse;
         this.format = format;
         this.operationMetrics = new OperationMetrics(clientStatisticsHolder);
         this.operationMetrics.operationComplete();
         this.operationMetrics.setQueryId(clickHouseResponse.getSummary().getQueryId());
+        this.settings = settings;
         ClientV1AdaptorHelper.setServerStats(clickHouseResponse.getSummary().getProgress(),
                 this.operationMetrics);
-        settings.setOption("server_timezone", clickHouseResponse.getTimeZone());
+        this.settings.setOption(ClickHouseClientOption.SERVER_TIME_ZONE.getKey(), clickHouseResponse.getTimeZone());
     }
 
-    public QueryResponse(ClassicHttpResponse response, ClickHouseFormat format, OperationMetrics operationMetrics) {
+    public QueryResponse(ClassicHttpResponse response, ClickHouseFormat format, QuerySettings settings,
+                         OperationMetrics operationMetrics) {
         this.clickHouseResponse = null;
         this.httpResponse = response;
         this.format = format;
         this.operationMetrics = operationMetrics;
+        this.settings = settings;
 
         Header tzHeader = response.getFirstHeader(ClickHouseHttpProto.HEADER_TIMEZONE);
         if (tzHeader != null) {
             try {
-                settings.setOption("server_timezone", TimeZone.getTimeZone(tzHeader.getValue()));
+                this.settings.setOption(ClickHouseClientOption.SERVER_TIME_ZONE.getKey(),
+                        TimeZone.getTimeZone(tzHeader.getValue()));
             } catch (Exception e) {
                 throw new ClientException("Failed to parse server timezone", e);
             }
@@ -172,9 +177,9 @@ public String getQueryId() {
     }
 
     public TimeZone getTimeZone() {
-        return settings.getOption("server_timezone") == null
+        return settings.getOption(ClickHouseClientOption.SERVER_TIME_ZONE.getKey()) == null
                 ? null
-                : (TimeZone) settings.getOption("server_timezone");
+                : (TimeZone) settings.getOption(ClickHouseClientOption.SERVER_TIME_ZONE.getKey());
     }
 
     public QuerySettings getSettings() {

client-v2/src/main/java/com/clickhouse/client/api/query/QuerySettings.java

@@ -151,6 +151,6 @@ public QuerySettings setUseTimeZone(String timeZone) {
     }
 
     public TimeZone getServerTimeZone() {
-        return (TimeZone) rawSettings.get("server_timezone");
+        return (TimeZone) rawSettings.get(ClickHouseClientOption.SERVER_TIME_ZONE.getKey());
     }
 }

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -89,7 +89,7 @@ public void setUp() {
                 .setPassword("")
                 .compressClientRequest(false)
                 .compressServerResponse(false)
-                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"))
+                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "false").equals("true"))
                 .build();
 
         delayForProfiler(0);