From 46c49ea73911327e2967198d08038ef4b947267d Mon Sep 17 00:00:00 2001
From: serebrserg <serebrserg@yandex-team.ru>
Date: Tue, 22 Mar 2016 13:07:50 +0300
Subject: [PATCH] METR-20494: add executeQuery methods with and without
additionalDBParams
---
.../ru/yandex/metrika/clickhouse/CHStatement.java | 3 +++
.../yandex/metrika/clickhouse/CHStatementImpl.java | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java
index b79d1644..bd41cf46 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java
+++ b/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;
}
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
index 97616da0..ecd49011 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
+++ b/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 {
--
GitLab