diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java index 0d98679312..d2c05abbc8 100644 --- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java +++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java @@ -1101,6 +1101,11 @@ private String getDefaultConnectionUrl(CommandLine cl) throws BeelineConfFilePar } if (beelineSiteParser.configExists()) { + String urlFromCommandLineOption = cl.getOptionValue("u"); + if (urlFromCommandLineOption != null) { + throw new BeelineSiteParseException( + "Not using beeline-site.xml since the user provided the url: " + urlFromCommandLineOption); + } // Get the named url from user specific config file if present Properties userNamedConnectionURLs = beelineSiteParser.getConnectionProperties(); if (!userNamedConnectionURLs.isEmpty()) { @@ -1123,6 +1128,14 @@ private String getDefaultConnectionUrl(CommandLine cl) throws BeelineConfFilePar } if (jdbcConnectionParams != null) { + String userName = cl.getOptionValue("n"); + if (userName != null) { + jdbcConnectionParams.getSessionVars().put(JdbcConnectionParams.AUTH_USER, userName); + } + String password = cl.getOptionValue("p"); + if (password != null) { + jdbcConnectionParams.getSessionVars().put(JdbcConnectionParams.AUTH_PASSWD, password); + } mergedConnectionProperties = HS2ConnectionFileUtils.mergeUserConnectionPropertiesAndBeelineSite( userConnectionProperties, jdbcConnectionParams);