METR-20494: add executeQuery methods with and without additionalDBParams

src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java

@@ -2,6 +2,7 @@ package ru.yandex.metrika.clickhouse;
 
 import ru.yandex.metrika.clickhouse.copypaste.ClickhouseResponse;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Map;
@@ -12,5 +13,7 @@ import java.util.Map;
  */
 public interface CHStatement extends Statement {
     ClickhouseResponse executeQueryClickhouseResponse(String sql) throws SQLException;
+    ClickhouseResponse executeQueryClickhouseResponse(String sql, Map<String, String> additionalDBParams) throws SQLException;
     ClickhouseResponse executeQueryClickhouseResponse(String sql, Map<String, String> additionalDBParams, boolean ignoreDatabase) throws SQLException;
+    ResultSet executeQuery(String sql, Map<String, String> additionalDBParams) throws SQLException;
 }

src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java

@@ -61,7 +61,11 @@ public class CHStatementImpl implements CHStatement {
 
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
-        InputStream is = getInputStream(sql, null, false);
+        return executeQuery(sql, null);
+    }
+
+    public ResultSet executeQuery(String sql, Map<String, String> additionalDBParams) throws SQLException {
+        InputStream is = getInputStream(sql, additionalDBParams, false);
         try {
             currentResult = new CHResultSet(properties.isCompress()
                     ? new ClickhouseLZ4Stream(is) : is, properties.getBufferSize(),
@@ -76,7 +80,11 @@ public class CHStatementImpl implements CHStatement {
     }
 
     public ClickhouseResponse executeQueryClickhouseResponse(String sql) throws SQLException {
-        return executeQueryClickhouseResponse(sql, null, false);
+        return executeQueryClickhouseResponse(sql, null);
+    }
+
+    public ClickhouseResponse executeQueryClickhouseResponse(String sql, Map<String, String> additionalDBParams) throws SQLException {
+        return executeQueryClickhouseResponse(sql, additionalDBParams, false);
     }
 
     public ClickhouseResponse executeQueryClickhouseResponse(String sql, Map<String, String> additionalDBParams, boolean ignoreDatabase) throws SQLException {