Fixes #319 ScriptRunner log writter doesn't work when the full script is sent.

Author: harawata

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

@@ -114,7 +114,9 @@ private void executeFullScript(Reader reader) {
         script.append(line);
         script.append(LINE_SEPARATOR);
       }
-      executeStatement(script.toString());
+      String command = script.toString();
+      println(command);
+      executeStatement(command);
       commitConnection();
     } catch (Exception e) {
       String message = "Error executing: " + script + ".  Cause: " + e;

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

@@ -26,7 +26,10 @@
 
 import javax.sql.DataSource;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -121,7 +124,7 @@ public void commentAferStatementDelimiterShouldNotCauseRunnerFail() throws Excep
       fail(e.getMessage());
     }
   }
-  
+
   @Test
   public void shouldReturnWarningIfNotTheCurrentDelimiterUsed() throws Exception {
     DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
@@ -164,6 +167,44 @@ public void changingDelimiterShouldNotCauseRunnerFail() throws Exception {
     }
   }
 
+  @Test
+  public void testLogging() throws Exception {
+    DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
+    Connection conn = ds.getConnection();
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setAutoCommit(true);
+    runner.setStopOnError(false);
+    runner.setErrorLogWriter(null);
+    runner.setSendFullScript(false);
+    StringWriter sw = new StringWriter();
+    PrintWriter logWriter = new PrintWriter(sw);
+    runner.setLogWriter(logWriter);
+
+    Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
+    runner.runScript(reader);
+
+    assertEquals("select userid from account where userid = 'j2ee'\n\nUSERID\t\nj2ee\t\n", sw.toString());
+  }
+
+  @Test
+  public void testLoggingFullScipt() throws Exception {
+    DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
+    Connection conn = ds.getConnection();
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setAutoCommit(true);
+    runner.setStopOnError(false);
+    runner.setErrorLogWriter(null);
+    runner.setSendFullScript(true);
+    StringWriter sw = new StringWriter();
+    PrintWriter logWriter = new PrintWriter(sw);
+    runner.setLogWriter(logWriter);
+
+    Reader reader = new StringReader("select userid from account where userid = 'j2ee';");
+    runner.runScript(reader);
+
+    assertEquals("select userid from account where userid = 'j2ee';\n\nUSERID\t\nj2ee\t\n", sw.toString());
+  }
+
   private void runJPetStoreScripts(ScriptRunner runner) throws IOException, SQLException {
     runScript(runner, JPETSTORE_DDL);
     runScript(runner, JPETSTORE_DATA);