docs

h2/src/docsrc/html/roadmap.html

@@ -54,10 +54,12 @@ Roadmap
 </li><li>Support function overloading as in Java (multiple functions with the same name, but different parameter count or data types).
 </li><li>Linked tables that point to the same database should share the connection ([SHARED CONNECTION]). Serialize access to the connection.
 </li><li>Linked tables should support a schema name: CREATE LINKED TABLE ... (... [schemaName, ] originalTableString) - DB2: SET SCHEMA after connecting
+</li><li>Option to shutdown all the running servers (on the same VM).
 </li><li>Support OSGi: http://oscar-osgi.sourceforge.net, http://incubator.apache.org/felix/index.html
 </li><li>Better space re-use in the files after deleting data: shrink the data file without closing the database (if the end of the file is empty)
-</li><li>Full outer joins
 </li><li>Procedural language / script language (Javascript)
+</li><li>Full outer joins
+</li><li>Support hints for the optimizer (which index to use, enforce the join order).
 </li><li>Change LOB mechanism (less files, keep index of lob files, point to files and row, delete unused files earlier, maybe bundle files into a tar file)
 </li><li>Clustering: recovery needs to becomes fully automatic. Global write lock feature.
 </li><li>Option for Java functions: constant/isDeterministic/readonly/pure (always return the same value) to allow early evaluation when all parameters are constant
@@ -305,7 +307,6 @@ Roadmap
 </li><li>Move Maven 2 repository from hsql.sf.net to h2database.sf.net
 </li><li>Java 1.5 tool: JdbcUtils.closeSilently(s1, s2,...)
 </li><li>Javadoc: document design patterns used
-</li><li>Update Wikipedia
 </li><li>Don't create @~ of not translated
 </li><li>Triggers for metadata tables; use for PostgreSQL catalog
 </li><li>Does the FTP server has problems with multithreading?
@@ -360,10 +361,11 @@ Roadmap
     This is supported by MySQL, but not Derby. Both PostgreSQL and HSQLDB don't support getGeneratedKeys. 
     Also support it when using INSERT ... SELECT. 
 </li><li>HSQLDB compatibility: automatic data type for SUM if value is the value is too big (by default use the same type as the data).
-</li><li>Support hints for the optimizer (which index to use).
 </li><li>Improve the optimizer to select the right index for special cases: where id between 2 and 4 and booleanColumn
 </li><li>H2 Console: new option 'Open a browser when starting the H2 Console'.
 </li><li>Enable warning for 'Local variable declaration hides another field or variable'.
+</li><li>Linked tables: make hidden columns available (Oracle: rowid and ora_rowscn columns).
+</li><li>Support merge join.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/main/org/h2/command/Parser.java

@@ -4553,7 +4553,7 @@ public class Parser {
      * 
      * @param sql the code snippet
      * @return the expression object
-     * @throws SQLException if the code snipped could not be parsed
+     * @throws SQLException if the code snippet could not be parsed
      */
     public Expression parseExpression(String sql) throws SQLException {
         parameters = new ObjectArray();

h2/src/main/org/h2/index/IndexType.java

@@ -125,9 +125,9 @@ public class IndexType {
     }
     
     /**
-     * Get the SQL snipped to create such an index.
+     * Get the SQL snippet to create such an index.
      * 
-     * @return the SQL snipped
+     * @return the SQL snippet
      */
     public String getSQL() {
         StringBuffer buff = new StringBuffer();

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

@@ -160,18 +160,6 @@ java org.h2.test.TestAll timer
 
 /*
 
-
-Hi,
-
-There is no hard limit, it depends on the use case. I will update the CLOB documentation as follows:
-
-CLOB is like VARCHAR, but intended for very large values. Unlike when using VARCHAR, large CLOB objects are not kept fully in-memory. CLOB should be used for documents and texts with arbitrary size such as XML or HTML documents, text files, or memo fields of unlimited size. VARCHAR should be used for text with relatively short average size (for example shorter than 200 characters). Short CLOBs are stored inline, but there is an 
-overhead compared to VARCHAR. Use PreparedStatement.setCharacterStream to store values.
-
-Regards,
-Thomas
-
-
 jazoon 
 
 upload and test javadoc/index.html
@@ -233,7 +221,7 @@ http://www.w3schools.com/sql/
 History:
 
 Roadmap:
-    Negative scale values for DECIMAL or NUMBER columns are not supported
+    Negative scale values for DECIMAL or NUMBER columns are now supported
         in regular tables and in linked tables.
     MySQL compatibility: auto_increment column are no longer automatically 
         converted to primary key columns.
@@ -243,6 +231,8 @@ Roadmap:
     The table SYSTEM_RANGE now supports expressions and parameters.
     If the drive with the database files was disconnected or unmounted while writing,
         sometimes a stack overflow exception was thrown instead of a IO exception.
+    The H2 Console could not be shut down from within the tool if the 
+        browser supports keepAlive (most browsers do).
 
 */
         if (args.length > 0) {