The Recover tool did not convert correctly convert CLOB data with non-ASCII characters.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>The Recover tool did not convert correctly convert CLOB data with non-ASCII characters.
+    This was also a problem when using the automatic upgrade to the page store file format.
 </li></ul>
 
 <h2>Version 1.2.128 (2010-01-30)</h2>

h2/src/main/org/h2/tools/Recover.java

@@ -162,7 +162,7 @@ public class Recover extends Tool implements DataHandler {
      * INTERNAL
      */
     public static Reader readClob(String fileName) throws IOException {
-        return new BufferedReader(new InputStreamReader(readBlob(fileName)));
+        return new BufferedReader(new InputStreamReader(readBlob(fileName), "UTF-8"));
     }
 
     /**

h2/src/test/org/h2/test/unit/TestTools.java

@@ -309,7 +309,7 @@ public class TestTools extends TestBase {
         stat.execute("create table test(id int primary key, name varchar, b blob, c clob)");
         stat.execute("create table \"test 2\"(id int primary key, name varchar)");
         stat.execute("comment on table test is ';-)'");
-        stat.execute("insert into test values(1, 'Hello', SECURE_RAND(2000), space(2000))");
+        stat.execute("insert into test values(1, 'Hello', SECURE_RAND(4100), '\u00e4' || space(4100))");
         ResultSet rs;
         rs = stat.executeQuery("select * from test");
         rs.next();
@@ -343,8 +343,9 @@ public class TestTools extends TestBase {
         assertEquals("Hello", rs.getString(2));
         byte[] b2 = rs.getBytes(3);
         String s2 = rs.getString(4);
-        assertEquals(2000, b2.length);
-        assertEquals(2000, s2.length());
+        assertEquals("\u00e4 ", s2.substring(0, 2));
+        assertEquals(4100, b2.length);
+        assertEquals(4101, s2.length());
         assertEquals(b1, b2);
         assertEquals(s1, s2);
         assertFalse(rs.next());