Documentation.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>H2 Console: improved autocomplete feature (also simplified the source code for this feature).
+<ul><li>When starting the H2 Console, the properties file can now be completely disabled.
+</li><li>Server.openBrowser no longer writes to System.out directly if opening the URL failed.
+</li><li>The INSERT optimizations (INSERT ... DIRECT SORTED SELECT) were not parsed correctly when using a column list.
+</li><li>H2 Console: the tables and columns are now listed for SQLite as well.
+</li><li>H2 Console: improved autocomplete feature (also simplified the source code for this feature).
 </li><li>The DbStarter servlet context listener now starts the server before opening a connection,
     so that connecting using the server mode works.
 </li><li>The Shell tool can now enable, disable, and display the current autocommit mode.

h2/src/docsrc/html/roadmap.html

@@ -461,6 +461,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Issue 163: Allow to create foreign keys on metadata types.
 </li><li>Logback: write a native DBAppender.
 </li><li>Cache size: don't use more cache than what is available.
+</li><li>Allow to defragment at runtime (similar to SHUTDOWN DEFRAG) in a background thread.
 </li><li>Tree index: Instead of an AVL tree, use a general balanced trees or a scapegoat tree.
 </li><li>User defined functions: allow to store the bytecode (of just the class, or the jar file of the extension) in the database.
 </li><li>Compatibility: ResultSet.getObject() on a CLOB (TEXT) should return String for PostgreSQL and MySQL.
@@ -535,7 +536,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support reading LOBs.
 </li><li>Require appending DANGEROUS=TRUE when using certain dangerous settings such as
     LOG=0, LOG=1, LOCK_MODE=0, disabling FILE_LOCK,...
-</li><li>Allow to defragment at runtime (similar to SHUTDOWN DEFRAG) in a background thread.
 </li><li>Support for Thread.interrupt to cancel running statements.
 </li><li>Oracle compatibility: support INSERT ALL.
 </li></ul>

h2/src/main/org/h2/constant/SysProperties.java

@@ -38,6 +38,11 @@ public class SysProperties {
      */
     public static final String H2_SCRIPT_DIRECTORY = "h2.scriptDirectory";
 
+    /**
+     * INTERNAL
+     */
+    public static final String H2_BROWSER = "h2.browser";
+
     /**
      * System property <code>file.encoding</code> (default: Cp1252).<br />
      * It is usually set by the system and is the default encoding used for the
@@ -91,7 +96,7 @@ public class SysProperties {
      * For Mac OS, if the default browser is not Safari and you want to use Safari,
      * use: <code>java -Dh2.browser="open,-a,Safari,%url" ...</code>.
      */
-    public static final String BROWSER = getStringSetting("h2.browser", null);
+    public static final String BROWSER = getStringSetting(H2_BROWSER, null);
 
     /**
      * System property <code>h2.enableAnonymousSSL</code> (default: true).<br />

h2/src/main/org/h2/res/help.csv

@@ -466,7 +466,7 @@ SET WRITE_DELAY int
 ","
 Set the maximum delay between a commit and flushing the log, in milliseconds."
 "Commands (Other)","SHUTDOWN","
-SHUTDOWN [ IMMEDIATELY | COMPACT ]
+SHUTDOWN [ IMMEDIATELY | COMPACT | DEFRAG ]
 ","
 This statement closes all open connections to the database and closes the
 database."

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

@@ -36,6 +36,6 @@ org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\
 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 SCRIPT)\n[-quiet]           Do not print progress information
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
-org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-properties "<dir>"]   The server properties directory (default\: ~)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-trace]                Print additional trace information (all servers)\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
+org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-properties "<dir>"]   Server properties (default\: ~, disable\: null)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-trace]                Print additional trace information (all servers)\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
 org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]        Print the list of options\n[-url "<url>"]         The database URL (jdbc\:h2\:...)\n[-user <user>]         The user name\n[-password <pwd>]      The password\n[-driver <class>]      The JDBC driver class to use (not required in most cases)\n[-sql "<statements>"]  Execute the SQL statements and exit\n[-properties "<dir>"]  Load the server properties from this directory\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).