diff --git a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java index 791fec6..c4afa0a 100644 --- a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java +++ b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java @@ -29,7 +29,6 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -44,8 +43,6 @@ import jline.console.completer.Completer; class DatabaseConnection { - private static final String HIVE_AUTH_USER = "user"; - private static final String HIVE_AUTH_PASSWD = "password"; private static final String HIVE_VAR_PREFIX = "hivevar:"; private static final String HIVE_CONF_PREFIX = "hiveconf:"; diff --git a/jdbc/src/java/org/apache/hive/jdbc/Utils.java b/jdbc/src/java/org/apache/hive/jdbc/Utils.java index b27e7bf..080e8fc 100644 --- a/jdbc/src/java/org/apache/hive/jdbc/Utils.java +++ b/jdbc/src/java/org/apache/hive/jdbc/Utils.java @@ -384,14 +384,17 @@ static JdbcConnectionParams parseURL(String uri, Properties info) throws JdbcUri } // Extract user/password from JDBC connection properties if its not supplied // in the connection URL - if (info.containsKey(JdbcConnectionParams.AUTH_USER)) { - connParams.getSessionVars().put(JdbcConnectionParams.AUTH_USER, - info.getProperty(JdbcConnectionParams.AUTH_USER)); - if (info.containsKey(JdbcConnectionParams.AUTH_PASSWD)) { - connParams.getSessionVars().put(JdbcConnectionParams.AUTH_PASSWD, - info.getProperty(JdbcConnectionParams.AUTH_PASSWD)); - } + if (!connParams.getSessionVars().containsKey(JdbcConnectionParams.AUTH_USER)) { + if (info.containsKey(JdbcConnectionParams.AUTH_USER)) { + connParams.getSessionVars().put(JdbcConnectionParams.AUTH_USER, + info.getProperty(JdbcConnectionParams.AUTH_USER)); + } + if (info.containsKey(JdbcConnectionParams.AUTH_PASSWD)) { + connParams.getSessionVars().put(JdbcConnectionParams.AUTH_PASSWD, + info.getProperty(JdbcConnectionParams.AUTH_PASSWD)); + } } + if (info.containsKey(JdbcConnectionParams.AUTH_TYPE)) { connParams.getSessionVars().put(JdbcConnectionParams.AUTH_TYPE, info.getProperty(JdbcConnectionParams.AUTH_TYPE));