--no commit message

--no commit message

h2/src/docsrc/html/build.html

@@ -30,8 +30,8 @@ Build
     Translating</a><br />
 <a href="#providing_patches">
     Providing Patches</a><br />
-<a href="#code_coverage">
-    Code Coverage</a><br />
+<a href="#automated">
+    Automated Build</a><br />
 
 <br /><a name="portability"></a>
 <h2>Portability</h2>
@@ -187,19 +187,16 @@ If you like to provide patches, please consider the following guidelines to simp
 </li><li>Submit patches as .patch files (compressed if big). To create a patch using Eclipse, use Team / Create Patch.
 </li></ul>
 
-<br /><a name="code_coverage"></a>
-<h2>Code Coverage</h2>
+<br /><a name="automated"></a>
+<h2>Automated Build</h2>
 <p>
-To generate the code coverage data, execute the following command:
+This build process is automated and runs regularly.
+The build process includes running the tests and code coverage.
+The last results are available here:
 </p>
-<pre>
-build compile coverage
-</pre>
-<p>
-The code coverage is run regularly, the last results are available here:
-</p>
-<ul><li><a href="http://h2database.com/coverage/overview.html">Overall Coverage Summary</a>
-</li><li><a href="http://h2database.com/coverage/coverage.zip">Details (download, 1.3 MB)</a>
+<ul><li><a href="http://h2database.com/html/testOutput.html">Test Output</a>
+</li><li><a href="http://h2database.com/coverage/overview.html">Code Coverage Summary</a>
+</li><li><a href="http://h2database.com/coverage/coverage.zip">Code Coverage Details (download, 1.3 MB)</a>
 </li></ul>
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/docsrc/html/roadmap.html

@@ -409,11 +409,12 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Allow to scan index backwards starting with a value (to better support ORDER BY DESC).
 </li><li>Java Service Wrapper: try http://yajsw.sourceforge.net/
 </li><li>Batch parameter for INSERT, UPDATE, and DELETE, and commit after each batch. See also MySQL DELETE.
+</li><li>MySQL compatibility: support ALTER TABLE .. MODIFY COLUMN.
 </li></ul>
 
 <h2>Not Planned</h2>
 <ul>
-<li>HSQLDB (did) support this: select id i from test where i>0 (other databases don't). Supporting it may break compatibility.
+<li>HSQLDB (did) support this: select id i from test where i&lt;0 (other databases don't). Supporting it may break compatibility.
 </li><li>String.intern (so that Strings can be compared with ==) will not be used because some VMs have problems when used extensively.
 </li></ul>
 

h2/src/main/org/h2/res/javadoc.properties

@@ -15,7 +15,7 @@ org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[
 org.h2.tools.Restore=Restores a H2 database by extracting the database files from a .zip file.
 org.h2.tools.Restore.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
 org.h2.tools.RunScript=Runs a SQL script against a database.
-org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)
+org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     RUNSCRIPT options (embedded H2; -*Results not supported)
 org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
 org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.

h2/src/test/org/h2/test/TestAll.java

@@ -131,6 +131,7 @@ import org.h2.test.unit.TestTools;
 import org.h2.test.unit.TestValue;
 import org.h2.test.unit.TestValueHashMap;
 import org.h2.test.unit.TestValueMemory;
+import org.h2.test.utils.OutputCatcher;
 import org.h2.tools.DeleteDbFiles;
 import org.h2.tools.Server;
 import org.h2.util.MemoryUtils;
@@ -271,6 +272,13 @@ java org.h2.test.TestAll timer
      * @param args the command line arguments
      */
     public static void main(String[] args) throws Exception {
+        OutputCatcher catcher = OutputCatcher.start();
+        run(args);
+        catcher.stop();
+        catcher.writeTo("Test Output", "docs/html/testOutput.html");
+    }
+
+    private static void run(String[] args) throws Exception {
         SelfDestructor.startCountdown(6 * 60);
         long time = System.currentTimeMillis();
         TestAll test = new TestAll();
@@ -282,13 +290,11 @@ java org.h2.test.TestAll timer
 
 /*
 
-copies db problems
+test shell tool on windows with special characters, try with
+java -Dfile.encoding=UTF-8
 
-auto-build: newsfeed for results
 auto-build: prepare release
 
-new ftp password
-
 pool: change default login timeout to 15 min
 
 automated tests: code coverage
@@ -677,7 +683,7 @@ kill -9 `jps -l | grep "org.h2.test.TestAll" | cut -d " " -f 1`
 
     private void printSystem() {
         Properties prop = System.getProperties();
-        System.out.println("H2 " + Constants.getFullVersion());
+        System.out.println("H2 " + Constants.getFullVersion() + " @ " + new java.sql.Timestamp(System.currentTimeMillis()).toString());
         System.out.println("Java " +
                 prop.getProperty("java.runtime.version") + ", " +
                 prop.getProperty("java.vm.name")+", " +

h2/src/test/org/h2/test/TestBase.java

@@ -370,14 +370,14 @@ public abstract class TestBase {
         if (e == null) {
             e = new Exception(s);
         }
-        System.out.println("ERROR: " + s + " " + e.toString() + " ------------------------------");
         System.out.flush();
+        System.err.println("ERROR: " + s + " " + e.toString() + " ------------------------------");
         e.printStackTrace();
         try {
             TraceSystem ts = new TraceSystem(null, false);
             FileLock lock = new FileLock(ts, "error.lock", 1000);
             lock.lock(FileLock.LOCK_FILE);
-            FileWriter fw = new FileWriter("ERROR.txt", true);
+            FileWriter fw = new FileWriter("error.txt", true);
             PrintWriter pw = new PrintWriter(fw);
             e.printStackTrace(pw);
             pw.close();