--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>File systems with a maximum file size (for example FAT) are now supported using
+<ul><li>Updatable result sets: the key columns can now be updated.
+</li><li>The H2DatabaseProvider for ActiveObjects is now included in the tools section.
+</li><li>The H2Platform for Oracle Toplink Essential has been improved a bit.
+</li><li>The Windows service to start H2 didn't work in version 1.1.
+</li><li>File systems with a maximum file size (for example FAT) are now supported using
     the file prefix 'split:'. In this case the files are split in parts of 1 GB.
     Example URL: jdbc:h2:split:~/db/test. If you want to split into parts of 1 MB, use
     jdbc:h2:split:20:~/db/test (the part size is 1 &lt;&lt; x, the default is 30 meaning 1 GB). 

h2/src/docsrc/html/roadmap.html

@@ -309,9 +309,8 @@ Of course, patches are always welcome, but are not always applied as is. Patches
     See http://thedevcloud.blogspot.com/2008/10/displaying-hsql-database-manager-in.html
 </li><li>Translation: use ${.} in help.csv
 </li><li>Translated .pdf
-</li><li>Cluster: hot deploy (adding a node on runtime)
-</li><li>Test with PostgreSQL Version 8.2
-</li><li>Website: Don't use frames.
+</li><li>Cluster: hot deploy (adding a node at runtime)
+</li><li>MySQL compatibility: update test1 t1, test2 t2 set t1.id = t2.id where t1.id = t2.id;
 </li><li>Try again with Lobo browser (pure Java)
 </li><li>Recovery tool: bad blocks should be converted to INSERT INTO SYSTEM_ERRORS(...), and things should go into the .trace.db file
 </li><li>RECOVER=2 to backup the database, run recovery, open the database
@@ -352,7 +351,6 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Linked tables: make hidden columns available (Oracle: rowid and ora_rowscn columns).
 </li><li>Support merge join.
 </li><li>H2 Console: in-place autocomplete. 
-</li><li>MySQL compatibility: update test1 t1, test2 t2 set t1.id = t2.id where t1.id = t2.id;
 </li><li>Oracle: support DECODE method (convert to CASE WHEN).
 </li><li>Support large databases: split LOB (BLOB, CLOB) to multiple directories / disks (similar to tablespaces).
 </li><li>Support to assign a primary key index a user defined name.

h2/src/docsrc/html/tutorial.html

@@ -50,6 +50,8 @@ Tutorial
     User-Defined Variables</a><br />
 <a href="#date_time">
     Date and Time</a><br />
+<a href="#spring">
+    Using Spring</a><br />
 
 <br /><a name="tutorial_starting_h2_console"></a>
 <h2>Starting and Using the H2 Console</h2>
@@ -103,7 +105,13 @@ If you don't want other computers in the network to access the application on yo
 let the firewall block those connections. The connection from the local machine will still work.
 Only if you want other computers to access the database on this computer, you need allow remote connections
 in the firewall.
-</p><p>
+</p>
+<p>
+It has been reported that when using Kaspersky 7.0 with firewall, the H2 Console is very slow when
+connecting over the IP address. A workaround is to connect using localhost, however this only works
+on the local machine.
+</p>
+<p>
 A small firewall is already built into the server: other computers may not connect to the server by default.
 To change this, go to 'Preferences' and select 'Allow connections from other computers'.
 </p>
@@ -841,5 +849,23 @@ you need to create a SQL script file using the SCRIPT command or Script tool, an
 the database using the RUNSCRIPT command or the RunScript tool in the new time zone.
 </p>
 
+<br /><a name="spring"></a>
+<h2>Using Spring</h2>
+<p>
+Use the following configuration to start and stop the H2 TCP Server using the Spring Framework:
+</p>
+<pre>
+&lt;bean id="org.h2.tools.Server"
+            class="org.h2.tools.Server"
+            factory-method="createTcpServer"
+            init-method="start"
+            destroy-method="stop"&gt;
+    &lt;constructor-arg value="-tcp,-tcpAllowOthers,true,-tcpPort,8043" /&gt;
+&lt;/bean&gt;
+</pre>
+<p>
+The "destroy-method" will help prevent exceptions on hot-redeployment or when restarting server.
+</p>
+
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
 

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

@@ -30,8 +30,7 @@ public class Restore extends Tool {
         out.println("java "+getClass().getName() + "\n" +
                 " [-file <filename>]  The source file name (default: backup.zip)\n" +
                 " [-dir <dir>]        Target directory (default: .)\n" +
-                " [-db <database>]    Target database name\n" +
-                " [-quiet]            Do not print progress information");
+                " [-db <database>]    Target database name");
         out.println("See also http://h2database.com/javadoc/" + getClass().getName().replace('.', '/') + ".html");
     }
 
@@ -44,7 +43,6 @@ public class Restore extends Tool {
      * </li><li>-file filename (the default is backup.zip)
      * </li><li>-dir database directory (the default is the current directory)
      * </li><li>-db database name (as stored in the backup if no name is specified)
-     * </li><li>-quiet does not print progress information
      * </li></ul>
      *
      * @param args the command line arguments

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

@@ -51,7 +51,6 @@ public class RunScript extends Tool {
                 " [-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" +
-                " [-quiet]           Do not print progress information\n" +
                 " [-showResults]     Show the statements and the results of queries\n" +
                 " [-checkResults]    Check if the query results match the expected results\n" +
                 " [-options ...]     The list of options (only for H2 embedded mode)");
@@ -70,10 +69,8 @@ public class RunScript extends Tool {
      * <li>-script filename (default file name is backup.sql) </li>
      * <li>-driver driver (the JDBC driver class name; not required for most
      * databases) </li>
-     * <li>-quiet (do not print progress information) </li>
      * <li>-showResults (show the statements and the results of queries)</li>
      * <li>-checkResults (check if the query results match the expected results</li>
-     * <li>-quiet (do not print progress information)</li>
      * <li>-options (to specify a list of options ;only for H2 and only when
      * using the embedded mode) </li>
      * </ul>

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

@@ -281,19 +281,12 @@ java org.h2.test.TestAll timer
         
 /*
 
-truncate in-memory file system after each test
-
 split files (1 GB max size)
 
-Windows service Wrapper not starting because of incorrect classpath
-where is wrapper.exe
-
 study SQLite file format
 
 multithreaded kernel
 
-use free ports http://www.iana.org/assignments/port-numbers
-
 remove old TODO
 
 online backup may not work for very large files 

h2/src/test/org/h2/test/todo/todo.txt

@@ -61,3 +61,16 @@ create index idx_test on test(id, version, idx);
 @LOOP 1000 select max(id)+1 from test;
 @LOOP 1000 select max(idx)+1 from test where id=1 and version=2;
 -- should be direct query
+
+
+Update Multiple Tables with Merge
+-----------------
+drop table statisticlog;
+create table statisticlog(id int primary key, datatext varchar, moment int);
+@LOOP 20000 insert into statisticlog values(?, ?, ?);
+merge into statisticlog(id, datatext) key(id)
+ select id, 'data1' from statisticlog order by moment limit 5;
+select * from statisticlog where id < 10;
+UPDATE statisticlog SET datatext = 'data2'
+ WHERE id IN (SELECT id FROM statisticlog ORDER BY moment LIMIT 5);
+select * from statisticlog where id < 10;
\ No newline at end of file

h2/src/tools/net/java/ao/db/H2DatabaseProvider.java.txt

@@ -27,7 +27,7 @@ public class H2DatabaseProvider extends HSQLDatabaseProvider {
     /** 
      * Create a new provider.
      * 
-     * @param uri the databae uri
+     * @param uri the database uri
      * @param username the user name
      * @param password the password
      */  

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -570,3 +570,4 @@ wednesday saturday friday tuesday sharing opposite fassi dario clauses
 factorial blogspot displaying thedevcloud dayof safety chrome favorite thumbs 
 localization olivier hprof jps jstack qua processor casting brasilia leap 
 daylight vision declarative shape formula webapp catalina study impact
+statisticlog activeobjects manske redeployment michael kaspersky datatext
\ No newline at end of file