fixes #1116 Allow using multiple characters as a delimiter. Also added a test that verifies various delimiter syntax.

Author: harawata

src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java

@@ -18,13 +18,14 @@
 import java.io.BufferedReader;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author Clinton Begin
@@ -35,6 +36,8 @@ public class ScriptRunner {
 
   private static final String DEFAULT_DELIMITER = ";";
 
+  private static final Pattern DELIMITER_PATTERN = Pattern.compile("^\\s*((--)|(//))?\\s*(//)?\\s*@DELIMITER\\s+([^\\s]+)", Pattern.CASE_INSENSITIVE);
+
   private final Connection connection;
 
   private boolean stopOnError;
@@ -192,14 +195,14 @@ private void checkForMissingLineTerminator(StringBuilder command) {
     }
   }
 
-  private StringBuilder handleLine(StringBuilder command, String line) throws SQLException, UnsupportedEncodingException {
+  private StringBuilder handleLine(StringBuilder command, String line) throws SQLException {
     String trimmedLine = line.trim();
     if (lineIsComment(trimmedLine)) {
-        final String cleanedString = trimmedLine.substring(2).trim().replaceFirst("//", "");
-        if(cleanedString.toUpperCase().startsWith("@DELIMITER")) {
-            delimiter = cleanedString.substring(11,12);
-            return command;
-        }
+      Matcher matcher = DELIMITER_PATTERN.matcher(trimmedLine);
+      if (matcher.find()) {
+        delimiter = matcher.group(5);
+        return command;
+      }
       println(trimmedLine);
     } else if (commandReadyToExecute(trimmedLine)) {
       command.append(line.substring(0, line.lastIndexOf(delimiter)));

src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java

@@ -20,9 +20,11 @@
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
 import org.apache.ibatis.io.Resources;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import javax.sql.DataSource;
 import java.io.IOException;
@@ -32,6 +34,7 @@
 import java.io.StringWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -241,4 +244,61 @@ private void assertProductsTableExistsAndLoaded() throws IOException, SQLExcepti
     }
   }
 
+  @Test
+  public void shouldAcceptDelimiterVariations() throws Exception {
+    Connection conn = mock(Connection.class);
+    Statement stmt = mock(Statement.class);
+    when(conn.createStatement()).thenReturn(stmt);
+    ScriptRunner runner = new ScriptRunner(conn);
+
+    String sql = "-- @DELIMITER | \n"
+        + "line 1;\n"
+        + "line 2;\n"
+        + "|\n"
+        + "//  @DELIMITER  ;\n"
+        + "line 3; \n"
+        + "-- //@deLimiTer $  blah\n"
+        + "line 4$\n"
+        + "// //@DELIMITER %\n"
+        + "line 5%\n";
+    Reader reader = new StringReader(sql);
+    runner.runScript(reader);
+
+    verify(stmt, Mockito.times(1)).execute(eq("line 1;\n" + "line 2;\n\n"));
+    verify(stmt, Mockito.times(1)).execute(eq("line 3\n"));
+    verify(stmt, Mockito.times(1)).execute(eq("line 4\n"));
+    verify(stmt, Mockito.times(1)).execute(eq("line 5\n"));
+  }
+
+  @Test
+  public void test() throws Exception {
+    StringBuilder sb = new StringBuilder();
+    StringBuilder sb2 = y(sb);
+    assertTrue(sb == sb2);
+  }
+
+  private StringBuilder y(StringBuilder sb) {
+    sb.append("ABC");
+    return sb;
+  }
+
+  @Test
+  public void shouldAcceptMultiCharDelimiter() throws Exception {
+    Connection conn = mock(Connection.class);
+    Statement stmt = mock(Statement.class);
+    when(conn.createStatement()).thenReturn(stmt);
+    ScriptRunner runner = new ScriptRunner(conn);
+
+    String sql = "-- @DELIMITER || \n"
+        + "line 1;\n"
+        + "line 2;\n"
+        + "||\n"
+        + "//  @DELIMITER  ;\n"
+        + "line 3; \n";
+    Reader reader = new StringReader(sql);
+    runner.runScript(reader);
+
+    verify(stmt, Mockito.times(1)).execute(eq("line 1;\n" + "line 2;\n\n"));
+    verify(stmt, Mockito.times(1)).execute(eq("line 3\n"));
+  }
 }