--no commit message

--no commit message

h2/src/docsrc/html/jaqu.html

@@ -18,6 +18,7 @@ JaQu
 <h2>What is JaQu</h2>
 <p>
 JaQu stands for Java Query and allows to access databases using pure Java. 
+JaQu provides a fluent interface (or internal DSL) for building SQL statements.
 JaQu replaces SQL, JDBC, and O/R frameworks such as Hibernate.
 JaQu is something like LINQ for Java (LINQ stands for "language integrated query" and is a 
 Microsoft .NET technology). The following JaQu code:
@@ -73,6 +74,11 @@ under:
 </li><li>src/tools/org/h2/jaqu/* (framework)
 </li></ul>
 
+<h2>Building the JaQu library</h2>
+<p>
+To create the JaQu jar file, run: <code>build jarJaqu</code>. This will create the file <code>bin/h2jaqu.jar</code>.
+</p>
+
 <h2>Requirements</h2>
 <p>
 JaQu requires Java 1.5. Annotations are not need.

h2/src/docsrc/html/roadmap.html

@@ -379,6 +379,8 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Support GRANT SELECT, UPDATE ON *.
 </li><li>Test Eclipse DTP.
 </li><li>Support JMX: Create an MBean for each database and server (support JConsole).
+</li><li>H2 Console: autocomplete: keep the previous setting
+</li><li>executeBatch: option to stop at the first failed statement.
 </li></ul>
 
 <h2>Not Planned</h2>

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

@@ -389,7 +389,7 @@ CREATE DOMAIN EMAIL AS VARCHAR(255) CHECK (POSITION('@', VALUE) > 1)
 "
 
 "Commands (DDL)","CREATE INDEX","
-CREATE {[UNIQUE [HASH]] INDEX [[IF NOT EXISTS] newIndexName]
+CREATE {[UNIQUE [HASH]] INDEX [IF NOT EXISTS] newIndexName
 | PRIMARY KEY [HASH]} ON tableName(columnName [,...])
 ","
 Creates a new index.
@@ -808,7 +808,7 @@ SET [DATABASE] COLLATION
 ","
 Sets the collation used for comparing strings.
 This command can only be executed if there are no tables defined.
-See java.test.Collator for details about STRENGTH.
+See java.text.Collator for details about STRENGTH.
 This setting is persistent.
 Admin rights are required to execute this command.
 ","

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

@@ -49,6 +49,8 @@ public class SamplesTest extends TestBase {
         db.insertAll(Product.getProductList());
         db.insertAll(Customer.getCustomerList());
         db.insertAll(Order.getOrderList());
+        // TODO use prepared statements
+        // TODO test all relevant data types (Date,...)
         // TODO nested AND/OR, >, <,...
         // TODO NOT
         // TODO +, -, *, /, ||, nested operations
@@ -56,7 +58,6 @@ public class SamplesTest extends TestBase {
         // TODO UPDATE: FROM ... UPDATE?
         // TODO SELECT UNION
         // TODO DatabaseAdapter
-        // TODO user prepared statements
         testOrAndNot();
         testDelete();
         testIsNull();