honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SQL test 

Original commit: elastic/x-pack-elasticsearch@14d07c2607
This commit is contained in:
Nik Everett 2017-10-27 17:38:34 -04:00
parent b91e9d85e9
commit f92684c436
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/JdbcSecurityIT.java
View File

@ -14,7 +14,6 @@ import java.sql.Statement;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.StringJoiner;
import static org.elasticsearch.xpack.qa.sql.jdbc.JdbcAssert.assertResultSets; import static org.elasticsearch.xpack.qa.sql.jdbc.JdbcAssert.assertResultSets;
import static org.elasticsearch.xpack.qa.sql.jdbc.JdbcIntegrationTestCase.elasticsearchAddress; import static org.elasticsearch.xpack.qa.sql.jdbc.JdbcIntegrationTestCase.elasticsearchAddress;
@ -142,4 +141,4 @@ public class JdbcSecurityIT extends SqlSecurityTestCase {
public JdbcSecurityIT() { public JdbcSecurityIT() {
super(new JdbcActions()); super(new JdbcActions());
} }
} }

6
sql/net-client/src/main/java/org/elasticsearch/xpack/sql/net/client/ConnectionConfiguration.java
View File

@ -75,7 +75,7 @@ public class ConnectionConfiguration {
public static final String AUTH_PASS = "pass"; public static final String AUTH_PASS = "pass";
protected static final Set<String> OPTION_NAMES = new LinkedHashSet<>( protected static final Set<String> OPTION_NAMES = new LinkedHashSet<>(
Arrays.asList(CONNECT_TIMEOUT, NETWORK_TIMEOUT, QUERY_TIMEOUT, PAGE_TIMEOUT, PAGE_SIZE)); Arrays.asList(CONNECT_TIMEOUT, NETWORK_TIMEOUT, QUERY_TIMEOUT, PAGE_TIMEOUT, PAGE_SIZE, AUTH_USER, AUTH_PASS));
static { static {
OPTION_NAMES.addAll(SslConfig.OPTION_NAMES); OPTION_NAMES.addAll(SslConfig.OPTION_NAMES);
@ -195,7 +195,7 @@ public class ConnectionConfiguration {
public int pageSize() { public int pageSize() {
return pageSize; return pageSize;
} }
// auth // auth
public String authUser() { public String authUser() {
return user; return user;
@ -204,4 +204,4 @@ public class ConnectionConfiguration {
public String authPass() { public String authPass() {
return pass; return pass;
} }
} }