commit e532203339511b12a5597fe6edf74dbdf522693d Author: Ayush Saxena Date: Fri Oct 23 17:13:34 2020 +0530 HIVE-24307. Beeline with property-file and -e parameter is failing. --- beeline/src/java/org/apache/hive/beeline/BeeLine.java | 2 ++ .../test/org/apache/hive/beeline/TestBeelineArgParsing.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java index a86fe5c002..6e6f5cb7dd 100644 --- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java +++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java @@ -933,6 +933,8 @@ private boolean connectUsingArgs(BeelineParser beelineParser, CommandLine cl) { if (!dispatch("!properties " + propertyFile)) { exit = true; return false; + } else { + return true; } } return false; diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java index db0cba36db..cd730fb780 100644 --- a/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java +++ b/beeline/src/test/org/apache/hive/beeline/TestBeelineArgParsing.java @@ -412,4 +412,17 @@ public void testReport() throws Exception { bl.close(); } + /** + * Test property file option with query. + */ + @Test + public void testPropertyFileWithQuery() throws Exception { + TestBeeline bl = new TestBeeline(); + String args[] = + new String[] {"--property-file", "props", "-e", "show tables"}; + Assert.assertEquals(0, bl.initArgs(args)); + Assert.assertEquals("props", bl.properties.get(0)); + Assert.assertEquals("show tables", bl.queries.get(0)); + bl.close(); + } }