--no commit message

--no commit message

h2/src/docsrc/help/help.csv

@@ -15,6 +15,8 @@ Selects data from a table or multiple tables.
 LIMIT limits the number of rows returned by the query, OFFSET specified how many
 rows to skip. SAMPLE_SIZE limits the number of rows read for aggregate queries.
 If FOR UPDATE is specified, the tables are locked for writing.
+
+FOR UPDATE will lock the table for writing.
 ","
 SELECT * FROM TEST;
 SELECT * FROM (SELECT ID, COUNT(*) FROM TEST
@@ -450,8 +452,10 @@ that name may exist in the target database.
 Usually, for update statements, the old rows are deleted first and then the new
 rows are inserted. It is possible to emit update statements (except on
 rollback), however in this case multi-row unique key updates may not always
-work. Linked tables to the same database share one connection. If a query is
-used instead of the original table name, the table is read only.
+work. Linked tables to the same database share one connection. 
+
+If a query is used instead of the original table name, the table is read only.
+Queries must be enclosed in parenthesis: (SELECT * FROM ORDERS).
 
 To use JNDI to get the connection, the driver class must be a
 javax.naming.Context (for example javax.naming.InitialContext), and the URL must
@@ -2064,7 +2068,7 @@ BOOL_OR(NAME LIKE 'W%')
 "
 
 "Functions (Aggregate)","COUNT","
-COUNT(*) | COUNT([DISTINCT] expression): int
+COUNT(*) | COUNT([DISTINCT] expression): long
 ","
 The count of all row, or of the non-null values. If no rows are selected, the
 result is 0. Aggregates are only allowed in select statements.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,7 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>The optimizer does a better job for joins if indexes are missing.
 </li></ul>
 
 <h2>Version 1.1.118 (2009-09-04)</h2>

h2/src/docsrc/html/roadmap.html

@@ -41,6 +41,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 <h2>Priority 2</h2>
 <ul>
 <li>Improve test code coverage
+</li><li>Issue 116: Maven: deploy / upload h2..-sources.jar and javadocs as well.
 </li><li>Procedural language / script language (Java, Javascript)
 </li><li>Fulltext search: support streaming CLOB data.
 </li><li>Enable warning for 'Local variable declaration hides another field or variable'.
@@ -53,7 +54,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Implement INSTEAD OF trigger (for views, tables, metadata tables).
 </li><li>Support triggers for INFORMATION_SCHEMA tables (to better support PostgreSQL catalog: rebuild after creating new tables)
 </li><li>Use triggers for metadata tables; use for PostgreSQL catalog
-</li><li>Maven: deploy / upload h2..-sources.jar and javadocs as well.
 </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>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)
@@ -448,6 +448,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Improve database file locking (maybe use native file locking). The current approach seems to be problematic
     if the file system is on a remote share (see Google Group 'Lock file modification time is in the future').
 </li><li>Document internal features such as BELONGS_TO_TABLE, NULL_TO_DEFAULT, SEQUENCE.
+</li><li>Issue 107: Prefer using the ORDER BY index if LIMIT is used.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/test/org/h2/test/jaqu/SamplesTest.java

@@ -51,7 +51,7 @@ public class SamplesTest extends TestBase {
         db.insertAll(Customer.getList());
         db.insertAll(Order.getList());
         db.insertAll(ComplexObject.getList());
-        // TODO support JavaBeans specification
+        // TODO support getters/setters
         // TODO support all relevant data types (byte[], ...)
         // TODO nested AND/OR, >, <, ...
         // TODO NOT