Formatting, javadocs

h2/src/docsrc/help/help.csv

@@ -213,8 +213,7 @@ SELECT sum(n) FROM t;
 ","
 WITH t1 AS (
         SELECT 1 AS FIRST_COLUMN
-),
-     t2 AS (
+), t2 AS (
         SELECT FIRST_COLUMN+1 AS FIRST_COLUMN FROM t1
 )
 SELECT sum(FIRST_COLUMN) FROM t2;

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

@@ -71,7 +71,7 @@ WITH [ RECURSIVE ] { name [( columnName [,...] )]
     AS ( select ) [,...] }
     select
 ","
-Can be used to create a recursive query."
+Can be used to create a recursive or non-recursive query (common table expression)."
 "Commands (DDL)","ALTER INDEX RENAME","
 ALTER INDEX [ IF EXISTS ] indexName RENAME TO newIndexName
 ","

h2/src/main/org/h2/table/TableView.java

@@ -207,7 +207,8 @@ public class TableView extends Table {
             // If it can't be compiled, then it's a 'zero column table'
             // this avoids problems when creating the view when opening the
             // database.
-            // If it can not be compiled - it could also be a recursive common table expression query.
+            // If it can not be compiled - it could also be a recursive common
+            // table expression query.
             if (isRecursiveQueryExceptionDetected(createException)) {
                 this.isRecursiveQueryDetected = true;
             }
@@ -673,6 +674,8 @@ public class TableView extends Table {
 
     /**
      * Was query recursion detected during compiling.
+     *
+     * @return true if yes
      */
     public boolean isRecursiveQueryDetected() {
         return isRecursiveQueryDetected;

h2/src/test/org/h2/test/db/TestGeneralCommonTableQueries.java

@@ -121,13 +121,14 @@ public class TestGeneralCommonTableQueries extends TestBase {
         PreparedStatement prep;
         ResultSet rs;
 
-        prep = conn.prepareStatement("    WITH t1 AS ("
-    	    +"        SELECT 1 AS FIRST_COLUMN"
-    	    +"),"
-    	    +"     t2 AS ("
-    	    +"        SELECT FIRST_COLUMN+1 AS FIRST_COLUMN FROM t1 "
-    	    +") "
-    	    +"SELECT sum(FIRST_COLUMN) FROM t2");
+        prep = conn.prepareStatement(
+                "    WITH t1 AS (" +
+                "        SELECT 1 AS FIRST_COLUMN" +
+                ")," +
+                "     t2 AS (" +
+                "        SELECT FIRST_COLUMN+1 AS FIRST_COLUMN FROM t1 " +
+                ") " +
+                "SELECT sum(FIRST_COLUMN) FROM t2");
 
         rs = prep.executeQuery();
         assertTrue(rs.next());
@@ -144,13 +145,14 @@ public class TestGeneralCommonTableQueries extends TestBase {
         PreparedStatement prep;
         ResultSet rs;
 
-        prep = conn.prepareStatement("WITH t1 AS ("
-    	    +"     SELECT X, 'T1' FROM SYSTEM_RANGE(?,?)"
-    	    +"),"
-    	    +"t2 AS ("
-    	    +"     SELECT X, 'T2' FROM SYSTEM_RANGE(?,?)"
-    	    +") "
-    	    +"SELECT * FROM t1 UNION ALL SELECT * FROM t2 UNION ALL SELECT X, 'Q' FROM SYSTEM_RANGE(?,?)");
+        prep = conn.prepareStatement("WITH t1 AS (" +
+                "     SELECT X, 'T1' FROM SYSTEM_RANGE(?,?)" +
+                ")," +
+                "t2 AS (" +
+                "     SELECT X, 'T2' FROM SYSTEM_RANGE(?,?)" +
+                ") " +
+                "SELECT * FROM t1 UNION ALL SELECT * FROM t2 " +
+                "UNION ALL SELECT X, 'Q' FROM SYSTEM_RANGE(?,?)");
         prep.setInt(1, 1);
         prep.setInt(2, 2);
         prep.setInt(3, 3);
@@ -199,7 +201,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
         prep.setInt(6, 6);
         rs = prep.executeQuery();
 
-        for(int n: new int[]{1,2,3,4,5,6} ){
+        for (int n : new int[] { 1, 2, 3, 4, 5, 6 }) {
             assertTrue(rs.next());
             assertEquals(n, rs.getInt(1));
         }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -736,3 +736,4 @@ arbonaut exposing obscure determined turkey buildings indexhints acct
 choosing optimise arte preparator katzyn bla jenkins tot artes pgserver npe
 suffers closeablem mni significance vise identiy vitalus aka ilike uppercasing reentrant
 aff ignite warm upstream producing sfu jit smtm affinity stashed tbl
+stumc numbered