Respect empty --execute argument

trinodb · Sep 4, 2019 · 5d2c2f7 · 5d2c2f7
1 parent 9fdbf20
commit 5d2c2f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/presto-cli/src/main/java/io/prestosql/cli/Console.java b/presto-cli/src/main/java/io/prestosql/cli/Console.java
@@ -86,7 +86,7 @@ public class Console
     public boolean run()
     {
         ClientSession session = clientOptions.toClientSession();
-        boolean hasQuery = !isNullOrEmpty(clientOptions.execute);
+        boolean hasQuery = clientOptions.execute != null;
         boolean isFromFile = !isNullOrEmpty(clientOptions.file);
 
         if (!hasQuery && !isFromFile) {

diff --git a/presto-product-tests/src/main/java/io/prestosql/tests/cli/PrestoCliTests.java b/presto-product-tests/src/main/java/io/prestosql/tests/cli/PrestoCliTests.java
@@ -40,6 +40,7 @@
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertTrue;
 
 public class PrestoCliTests
         extends PrestoCliLauncher
@@ -125,6 +126,15 @@ public void shouldRunBatchQuery()
         presto.waitForWithTimeoutAndKill();
     }
 
+    @Test(groups = CLI, timeOut = TIMEOUT)
+    public void shouldExecuteEmptyListOfStatements()
+            throws Exception
+    {
+        launchPrestoCliWithServerArgument("--execute", "");
+        assertTrue(trimLines(presto.readRemainingOutputLines()).isEmpty());
+        presto.waitForWithTimeoutAndKill();
+    }
+
     @Test(groups = CLI, timeOut = TIMEOUT)
     public void shouldUseCatalogAndSchemaOptions()
             throws Exception