Ensure that all results are processed when executing multiple statements (i.e. sendFullScript=true).

Otherwise, an error in the second and subsequent statement might be ignored according to the JDBC spec (in practice, though, most RDBMSs throw an exception with the old code). See mybatis/migrations#118

Author: harawata

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -225,59 +225,70 @@ private boolean commandReadyToExecute(String trimmedLine) {
   }
 
   private void executeStatement(String command) throws SQLException {
-    boolean hasResults = false;
     Statement statement = connection.createStatement();
-    statement.setEscapeProcessing(escapeProcessing);
-    String sql = command;
-    if (removeCRs) {
-      sql = sql.replaceAll("\r\n", "\n");
-    }
-    if (stopOnError) {
-      hasResults = statement.execute(sql);
-      if (throwWarning) {
-        // In Oracle, CRATE PROCEDURE, FUNCTION, etc. returns warning
-        // instead of throwing exception if there is compilation error.
-        SQLWarning warning = statement.getWarnings();
-        if (warning != null) {
-          throw warning;
-        }
+    try {
+      statement.setEscapeProcessing(escapeProcessing);
+      String sql = command;
+      if (removeCRs) {
+        sql = sql.replaceAll("\r\n", "\n");
       }
-    } else {
       try {
-        hasResults = statement.execute(sql);
+        boolean hasResults = statement.execute(sql);
+        while (!(!hasResults && statement.getUpdateCount() == -1)) {
+          checkWarnings(statement);
+          printResults(statement, hasResults);
+          hasResults = statement.getMoreResults();
+        }
+      } catch (SQLWarning e) {
+        throw e;
       } catch (SQLException e) {
-        String message = "Error executing: " + command + ".  Cause: " + e;
-        printlnError(message);
+        if (stopOnError) {
+          throw e;
+        } else {
+          String message = "Error executing: " + command + ".  Cause: " + e;
+          printlnError(message);
+        }
+      }
+    } finally {
+      try {
+        statement.close();
+      } catch (Exception e) {
+        // Ignore to workaround a bug in some connection pools
+        // (Does anyone know the details of the bug?)
       }
     }
-    printResults(statement, hasResults);
-    try {
-      statement.close();
-    } catch (Exception e) {
-      // Ignore to workaround a bug in some connection pools
+  }
+
+  private void checkWarnings(Statement statement) throws SQLException {
+    if (!throwWarning) {
+      return;
+    }
+    // In Oracle, CREATE PROCEDURE, FUNCTION, etc. returns warning
+    // instead of throwing exception if there is compilation error.
+    SQLWarning warning = statement.getWarnings();
+    if (warning != null) {
+      throw warning;
     }
   }
 
   private void printResults(Statement statement, boolean hasResults) {
-    try {
-      if (hasResults) {
-        ResultSet rs = statement.getResultSet();
-        if (rs != null) {
-          ResultSetMetaData md = rs.getMetaData();
-          int cols = md.getColumnCount();
-          for (int i = 0; i < cols; i++) {
-            String name = md.getColumnLabel(i + 1);
-            print(name + "\t");
-          }
-          println("");
-          while (rs.next()) {
-            for (int i = 0; i < cols; i++) {
-              String value = rs.getString(i + 1);
-              print(value + "\t");
-            }
-            println("");
-          }
+    if (!hasResults) {
+      return;
+    }
+    try (ResultSet rs = statement.getResultSet()) {
+      ResultSetMetaData md = rs.getMetaData();
+      int cols = md.getColumnCount();
+      for (int i = 0; i < cols; i++) {
+        String name = md.getColumnLabel(i + 1);
+        print(name + "\t");
+      }
+      println("");
+      while (rs.next()) {
+        for (int i = 0; i < cols; i++) {
+          String value = rs.getString(i + 1);
+          print(value + "\t");
         }
+        println("");
       }
     } catch (SQLException e) {
       printlnError("Error printing results: " + e.getMessage());

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

@@ -251,6 +251,7 @@ public void shouldAcceptDelimiterVariations() throws Exception {
     Connection conn = mock(Connection.class);
     Statement stmt = mock(Statement.class);
     when(conn.createStatement()).thenReturn(stmt);
+    when(stmt.getUpdateCount()).thenReturn(-1);
     ScriptRunner runner = new ScriptRunner(conn);
 
     String sql = "-- @DELIMITER | \n"
@@ -289,6 +290,7 @@ public void shouldAcceptMultiCharDelimiter() throws Exception {
     Connection conn = mock(Connection.class);
     Statement stmt = mock(Statement.class);
     when(conn.createStatement()).thenReturn(stmt);
+    when(stmt.getUpdateCount()).thenReturn(-1);
     ScriptRunner runner = new ScriptRunner(conn);
 
     String sql = "-- @DELIMITER || \n"