Update StatementImpl.java

Author: Paultagoras

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -144,11 +144,11 @@ public ResultSetImpl executeQuery(String sql, QuerySettings settings) throws SQL
         checkClosed();
         QuerySettings mergedSettings = QuerySettings.merge(connection.getDefaultQuerySettings(), settings);
 
-        if (settings.getQueryId() != null) {
-            lastQueryId = settings.getQueryId();
+        if (mergedSettings.getQueryId() != null) {
+            lastQueryId = mergedSettings.getQueryId();
         } else {
             lastQueryId = UUID.randomUUID().toString();
-            settings.setQueryId(lastQueryId);
+            mergedSettings.setQueryId(lastQueryId);
         }
         LOG.debug("Query ID: {}", lastQueryId);
 
@@ -198,11 +198,11 @@ public int executeUpdate(String sql, QuerySettings settings) throws SQLException
 
         QuerySettings mergedSettings = QuerySettings.merge(connection.getDefaultQuerySettings(), settings);
 
-        if (settings.getQueryId() != null) {
-            lastQueryId = settings.getQueryId();
+        if (mergedSettings.getQueryId() != null) {
+            lastQueryId = mergedSettings.getQueryId();
         } else {
             lastQueryId = UUID.randomUUID().toString();
-            settings.setQueryId(lastQueryId);
+            mergedSettings.setQueryId(lastQueryId);
         }
 
         lastSql = parseJdbcEscapeSyntax(sql);