fix for http://code.google.com/p/mybatis/issues/detail?id=49 encoding problem when reading script files in migrations. Thanks Iwao.

Author: emacarron

pom.xml

@@ -34,6 +34,10 @@
         <name>Franta Mejta</name>
         <email>[email protected]</email>
     </contributor>
+    <contributor>
+        <name>Iwao AVE!</name>
+        <email>[email protected]</email>
+    </contributor>
     <contributor>
         <name>Riccardo Cossu</name>
         <email>[email protected]</email>

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

@@ -23,16 +23,11 @@ public class ScriptRunner {
 
   private String delimiter = DEFAULT_DELIMITER;
   private boolean fullLineDelimiter = false;
-  private String characterSetName;
 
   public ScriptRunner(Connection connection) {
     this.connection = connection;
   }
 
-  public void setCharacterSetName(String characterSetName) {
-    this.characterSetName = characterSetName;
-  }
-
   public void setStopOnError(boolean stopOnError) {
     this.stopOnError = stopOnError;
   }
@@ -181,9 +176,6 @@ private boolean commandReadyToExecute(String trimmedLine) {
   }
 
   private void executeStatement(String command) throws SQLException, UnsupportedEncodingException {
-    if(characterSetName != null){
-      command = new String(command.getBytes(), characterSetName);
-    }
     boolean hasResults = false;
     Statement statement = connection.createStatement();
     if (stopOnError) {

src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java

@@ -2,11 +2,16 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -235,12 +240,10 @@ protected ScriptRunner getScriptRunner() {
       String url = props.getProperty("url");
       String username = props.getProperty("username");
       String password = props.getProperty("password");
-      String charSetName = props.getProperty("script_char_set");
       PrintWriter outWriter = new PrintWriter(printStream);
       UnpooledDataSource dataSource = new UnpooledDataSource(driverClassLoader, driver, url, username, password);
       dataSource.setAutoCommit(false);
       ScriptRunner scriptRunner = new ScriptRunner(dataSource.getConnection());
-      scriptRunner.setCharacterSetName(charSetName);
       scriptRunner.setStopOnError(!force);
       scriptRunner.setLogWriter(outWriter);
       scriptRunner.setErrorLogWriter(outWriter);
@@ -390,4 +393,14 @@ private Change parseChangeFromFilename(String filename) {
       throw new MigrationException("Error parsing change from file.  Cause: " + e, e);
     }
   }
+
+  protected Reader scriptFileReader(File scriptFile) throws FileNotFoundException, UnsupportedEncodingException {
+    InputStream inputStream = new FileInputStream(scriptFile);
+    String charset = environmentProperties().getProperty("script_char_set");
+    if (charset == null || charset.length() == 0) {
+      return new InputStreamReader(inputStream);
+    } else {
+      return new InputStreamReader(inputStream, charset);
+    }
+  }
 }

src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java

@@ -5,7 +5,6 @@
 import org.apache.ibatis.migration.MigrationReader;
 
 import java.io.File;
-import java.io.FileReader;
 
 public class BootstrapCommand extends BaseCommand {
 
@@ -23,7 +22,7 @@ public void execute(String... params) {
           printStream.println(horizontalLine("Applying: bootstrap.sql", 80));
           ScriptRunner runner = getScriptRunner();
           try {
-            runner.runScript(new MigrationReader(new FileReader(bootstrap), false, environmentProperties()));
+            runner.runScript(new MigrationReader(scriptFileReader(bootstrap), false, environmentProperties()));
           } finally {
             runner.closeConnection();
           }

src/main/java/org/apache/ibatis/migration/commands/DownCommand.java

@@ -1,7 +1,6 @@
 package org.apache.ibatis.migration.commands;
 
 import java.io.File;
-import java.io.FileReader;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
@@ -29,7 +28,7 @@ public void execute(String... params) {
           printStream.println(horizontalLine("Undoing: " + change.getFilename(), 80));
           ScriptRunner runner = getScriptRunner();
           try {
-            runner.runScript(new MigrationReader(new FileReader(scriptFile(change.getFilename())), true, environmentProperties()));
+            runner.runScript(new MigrationReader(scriptFileReader(scriptFile(change.getFilename())), true, environmentProperties()));
           } finally {
             runner.closeConnection();
           }

src/main/java/org/apache/ibatis/migration/commands/PendingCommand.java

@@ -6,7 +6,6 @@
 import org.apache.ibatis.migration.MigrationReader;
 
 import java.io.File;
-import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -28,7 +27,7 @@ public void execute(String... params) {
         printStream.println(horizontalLine("Applying: " + change.getFilename(), 80));
         ScriptRunner runner = getScriptRunner();
         try {
-          runner.runScript(new MigrationReader(new FileReader(scriptFile(change.getFilename())), false, environmentProperties()));
+          runner.runScript(new MigrationReader(scriptFileReader(scriptFile(change.getFilename())), false, environmentProperties()));
         } finally {
           runner.closeConnection();
         }

src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java

@@ -5,7 +5,6 @@
 import org.apache.ibatis.migration.MigrationReader;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -41,8 +40,7 @@ public void execute(String... sparams) {
         if (shouldRun(change, v1, v2)) {
           printStream.println("-- " + change.getFilename());
           File file = scriptFile(change.getFilename());
-          FileReader fileReader = new FileReader(file);
-          MigrationReader migrationReader = new MigrationReader(fileReader, undo, variables);
+          MigrationReader migrationReader = new MigrationReader(scriptFileReader(file), undo, variables);
           char[] cbuf = new char[1024];
           int l;
           while ((l = migrationReader.read(cbuf)) == cbuf.length) {

src/main/java/org/apache/ibatis/migration/commands/UpCommand.java

@@ -6,7 +6,6 @@
 import org.apache.ibatis.migration.MigrationReader;
 
 import java.io.File;
-import java.io.FileReader;
 import java.util.List;
 
 public class UpCommand extends BaseCommand {
@@ -35,7 +34,7 @@ public void execute(String... params) {
           printStream.println(horizontalLine("Applying: " + change.getFilename(), 80));
           ScriptRunner runner = getScriptRunner();
           try {
-            runner.runScript(new MigrationReader(new FileReader(scriptFile(change.getFilename())), false, environmentProperties()));
+            runner.runScript(new MigrationReader(scriptFileReader(scriptFile(change.getFilename())), false, environmentProperties()));
           } finally {
             runner.closeConnection();
           }

src/test/java/org/apache/ibatis/submitted/encoding/EncodingTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
@@ -22,15 +23,18 @@ public class EncodingTest {
   public static void setUp() throws Exception {
     Connection conn = null;
 
+    // save charset
+    Charset charset = Resources.getCharset();
+
     try {
       Class.forName("org.hsqldb.jdbcDriver");
       conn = DriverManager.getConnection("jdbc:hsqldb:mem:encoding", "sa", "");
 
+      // make sure that the SQL file has been saved in UTF-8!
+      Resources.setCharset(Charset.forName("utf-8"));
       Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/encoding/CreateDB.sql");
 
       ScriptRunner runner = new ScriptRunner(conn);
-      // make sure that the SQL file has been saved in UTF-8!
-      runner.setCharacterSetName("UTF-8");
       runner.setLogWriter(null);
       runner.setErrorLogWriter(null);
       runner.runScript(reader);
@@ -40,7 +44,11 @@ public static void setUp() throws Exception {
       reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/encoding/EncodingConfig.xml");
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
       reader.close();
+
     } finally {
+      // restore charset
+      Resources.setCharset(charset);
+      
       if (conn != null) {
         conn.close();
       }

src/test/java/org/apache/ibatis/submitted/multidb/MultiDbTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
@@ -30,8 +31,6 @@ public static void setUp() throws Exception {
       Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/multidb/CreateDB.sql");
 
       ScriptRunner runner = new ScriptRunner(conn);
-      // make sure that the SQL file has been saved in UTF-8!
-      runner.setCharacterSetName("UTF-8");
       runner.setLogWriter(null);
       runner.setErrorLogWriter(null);
       runner.runScript(reader);