Documentation.

h2/src/docsrc/help/help.csv

@@ -2969,7 +2969,7 @@ DATEADD('MONTH', 1, DATE '2001-01-31')
 "Functions (Time and Date)","DATEDIFF","
 { DATEDIFF | TIMESTAMPDIFF } (unitString, aTimestamp, bTimestamp)
 ","
-Returns the difference between two timestamps.
+Returns the the number of crossed unit boundaries between two timestamps.
 This method returns a long.
 The string indicates the unit.
 The same units as in the EXTRACT function are supported.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,15 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Version 1.2.137 could still not be converted to Java 1.4
+<ul><li>Experimental feature to support nested joins.
+    To enable, set the system property h2.nestedJoins to true.
+    If enabled, nested joins and right outer joins should work as expected (issues 145, 177, and 203).
+    The plan is to enable this feature by default in version 1.3.x.
+</li><li>New sample application: CachedPreparedStatements.
+</li><li>When creating functions within a schema, those functions could not be used
+    in views, nested queries, and constraints. Fixed.
+</li><li>The benchmarks have been run using recent database versions.
+</li><li>Version 1.2.137 could still not be converted to Java 1.4
     (because the Retrotranslator doesn't support BigDecimal.precision).
 </li><li>Cluster: non-admin users could not connect when one of the cluster node was stopped. Issue 206.
 </li></ul>

h2/src/docsrc/html/history.html

@@ -124,6 +124,7 @@ spread the word, and translated this project. Also many thanks to the donors:
 </li><li>Iyama Jun, Japan
 </li><li>Gray Watson, USA
 </li><li>Erik Dick, Germany
+</li><li>Pengxiang Shao, China
 </li></ul>
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/docsrc/html/roadmap.html

@@ -33,6 +33,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
     Later, change MAX_MEMORY_UNDO to reflect number of bytes instead of record
     (also remove Constants.UNDO_BLOCK_SIZE).
     Later, change undo log file format (fillAligned no longer required; var int).
+</li><li>Enable h2.nestedJoins (nested joins and right outer joins).
 </li></ul>
 
 <h2>Priority 1</h2>
@@ -46,6 +47,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 <ul><li>Support nested outer joins (see todo.txt, issues 145, 177, 203).
 </li><li>Improve test code coverage.
 </li><li>Test multi-threaded in-memory db access.
+</li><li>Access rights: remember the owner of an object. Create, alter and drop privileges. COMMENT: allow owner of object to change it. Issue 208
 </li><li>Full outer joins.
 </li><li>Clustering: support mixed clustering mode (one embedded, others in server mode).
 </li><li>Clustering: reads should be randomly distributed (optional) or to a designated database on RAM (parameter: READ_FROM=3).
@@ -53,7 +55,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Test very large databases and LOBs (up to 256 GB).
 </li><li>Support hints for the optimizer (which index to use, enforce the join order).
 </li><li>Sequence: add features [NO] MINVALUE, MAXVALUE, CYCLE.
-</li><li>Access rights: remember the owner of an object. Create, alter and drop privileges. COMMENT: allow owner of object to change it.
 </li><li>Deferred integrity checking (DEFERRABLE INITIALLY DEFERRED).
 </li><li>Groovy Stored Procedures: http://groovy.codehaus.org/Groovy+SQL
 </li><li>Add a migration guide (list differences between databases).
@@ -179,6 +180,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Updatable result set on table without primary key or unique index.
 </li><li>Use LinkedList instead of ArrayList where applicable.
 </li><li>Allow execution time prepare for SELECT * FROM CSVREAD(?, 'columnNameString')
+</li><li>Support data type INTERVAL
 </li><li>Support % operator (modulo).
 </li><li>Support JMX: create an MBean for each database and server (support JConsole).
     See http://thedevcloud.blogspot.com/2008/10/displaying-hsql-database-manager-in.html
@@ -224,7 +226,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Document SET SEARCH_PATH, BEGIN, EXECUTE, parameters
 </li><li>Browser: use Desktop.isDesktopSupported and browse when using JDK 1.6
 </li><li>Server: use one listener (detect if the request comes from an PG or TCP client)
-</li><li>Support data type INTERVAL
 </li><li>Optimize SELECT MIN(ID), MAX(ID), COUNT(*) FROM TEST WHERE ID BETWEEN 100 AND 200
 </li><li>Sequence: PostgreSQL compatibility (rename, create) http://www.postgresql.org/docs/8.2/static/sql-altersequence.html
 </li><li>DISTINCT: support large result sets by sorting on all columns (additionally) and then removing duplicates.
@@ -495,6 +496,8 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Improve documentation of system properties: only list the property names, default values, and description.
 </li><li>Support running totals / cumulative sum using SUM(..) OVER(..).
 </li><li>Improve object memory size calculation. Use constants for known VMs, or use reflection to call java.lang.instrument.Instrumentation.getObjectSize(Object objectToSize)
+</li><li>Triggers: NOT NULL checks should be done after running triggers (Oracle behavior, maybe others).
+</li><li>Log long running transactions (similar to long running statements).
 </li></ul>
 
 <h2>Not Planned</h2>

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

@@ -50,9 +50,9 @@ Hi,
 
 This looks like a corrupt database. A workarounds is: use the tool org.h2.tools.Recover to create the SQL script file, and then re-create the database using this script. Does it work when you do this?
 
-As far as I see, you are using version 1.2.128. An important corruption problem was fixed in version 1.2.135 (see the change log). Known causes for corrupt databases are:
+An important corruption problem was fixed in version 1.2.135 (see the change log). Known causes for corrupt databases are:
 
-- If the database was used with a version older than 1.2.135, and the process was killed while the database was closing or writing a checkpoint.
+- If the database was created or used with a version older than 1.2.135, and the process was killed while the database was closing or writing a checkpoint.
 
 - Using the transaction isolation level READ_UNCOMMITTED (LOCK_MODE 0) while at the same time using multiple connections.