Merge pull request #363 from bence-takacs/master

 mybatis #355 PL/SQL is not fully supported

Author: emacarron

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

@@ -186,11 +186,12 @@ private void checkForMissingLineTerminator(StringBuilder command) {
 
   private StringBuilder handleLine(StringBuilder command, String line) throws SQLException, UnsupportedEncodingException {
     String trimmedLine = line.trim();
-    if (trimmedLine.toUpperCase().startsWith("DELIMITER")) {
-        delimiter = trimmedLine.substring(10).trim();
-        return command;
-    }
     if (lineIsComment(trimmedLine)) {
+        final String cleanedString = trimmedLine.substring(2).trim();
+        if(cleanedString.toUpperCase().startsWith("//@DELIMITER")) {
+            delimiter = cleanedString.substring(13,14);
+            return command;
+        }
       println(trimmedLine);
     } else if (commandReadyToExecute(trimmedLine)) {
       command.append(line.substring(0, line.lastIndexOf(delimiter)));

src/test/java/org/apache/ibatis/jdbc/ScriptChangingDelimiter.sql

@@ -0,0 +1,26 @@
+--
+--    Copyright 2009-2012 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+drop table signon;
+
+--//@DELIMITER /
+create table signon (
+username varchar(25) not null,
+password varchar(25)  not null,
+constraint pk_signon primary key (username)
+)
+/
+--//@DELIMITER ;

src/test/java/org/apache/ibatis/jdbc/ScriptChangingDelimiterMissingDelimiter.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2009-2012 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+drop table signon;
+
+--//@DELIMITER /
+create table signon (
+username varchar(25) not null,
+password varchar(25)  not null,
+constraint pk_signon primary key (username)
+);
+--//@DELIMITER ;

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

@@ -121,6 +121,48 @@ public void commentAferStatementDelimiterShouldNotCauseRunnerFail() throws Excep
       fail(e.getMessage());
     }
   }
+  
+  @Test
+  public void shouldReturnWarningIfNotTheCurrentDelimiterUsed() throws Exception {
+    DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
+    Connection conn = ds.getConnection();
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setAutoCommit(false);
+    runner.setStopOnError(true);
+    runner.setErrorLogWriter(null);
+    runner.setLogWriter(null);
+
+    String resource = "org/apache/ibatis/jdbc/ScriptChangingDelimiterMissingDelimiter.sql";
+    Reader reader = Resources.getResourceAsReader(resource);
+
+    try {
+      runner.runScript(reader);
+      fail("Expected script runner to fail due to the usage of invalid delimiter.");
+    } catch (Exception e) {
+      assertTrue(e.getMessage().contains("end-of-line terminator"));
+    }
+  }
+
+  @Test
+  public void changingDelimiterShouldNotCauseRunnerFail() throws Exception {
+    DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
+    Connection conn = ds.getConnection();
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setAutoCommit(false);
+    runner.setStopOnError(true);
+    runner.setErrorLogWriter(null);
+    runner.setLogWriter(null);
+    runJPetStoreScripts(runner);
+
+    String resource = "org/apache/ibatis/jdbc/ScriptChangingDelimiter.sql";
+    Reader reader = Resources.getResourceAsReader(resource);
+
+    try {
+      runner.runScript(reader);
+    } catch (Exception e) {
+      fail(e.getMessage());
+    }
+  }
 
   private void runJPetStoreScripts(ScriptRunner runner) throws IOException, SQLException {
     runScript(runner, JPETSTORE_DDL);