[SQLLINE-42] Script fails if first line is a comment

julianhyde · May 14, 2016 · 20b1cce · 20b1cce
1 parent 3cf87e3
commit 20b1cce
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/main/java/sqlline/SqlLine.java b/src/main/java/sqlline/SqlLine.java
@@ -759,10 +759,12 @@ void dispatch(String line, DispatchCallback callback) {
     }
 
     if (line.trim().length() == 0) {
+      callback.setStatus(DispatchCallback.Status.SUCCESS);
       return;
     }
 
     if (isComment(line)) {
+      callback.setStatus(DispatchCallback.Status.SUCCESS);
       return;
     }
 

diff --git a/src/test/java/sqlline/SqlLineArgsTest.java b/src/test/java/sqlline/SqlLineArgsTest.java
@@ -152,6 +152,37 @@ public void testPositiveScriptFileUsingRun() throws Throwable {
         containsString(" 123 "));
   }
 
+  /**
+   * Test case for [SQLLINE-42], "Script fails if first line is a comment".
+   */
+  @Test
+  public void testScriptFileStartsWithComment() throws Throwable {
+    final String scriptText = "-- a comment\n"
+        + "call 100 + 23;\n";
+    checkScriptFile(scriptText, true,
+        equalTo(SqlLine.Status.OK),
+        containsString(" 123 "));
+  }
+
+  @Test
+  public void testScriptFileStartsWithEmptyLine() throws Throwable {
+    final String scriptText = "\n"
+        + "call 100 + 23;\n";
+    checkScriptFile(scriptText, true,
+        equalTo(SqlLine.Status.OK),
+        containsString(" 123 "));
+  }
+
+  @Test
+  public void testScriptFileContainsComment() throws Throwable {
+    final String scriptText = "values 10 + 23;\n"
+        + "-- a comment\n"
+        + "values 100 + 23;\n";
+    checkScriptFile(scriptText, true,
+        equalTo(SqlLine.Status.OK),
+        allOf(containsString(" 33 "), containsString(" 123 ")));
+  }
+
   /**
    * Values that contain null.
    */