Extract interval data types into subcategory in documentation

h2/src/docsrc/help/help.csv

@@ -3048,7 +3048,26 @@ and ""ResultSet.getObject(..)"" or ""ResultSet.getString(..)"" to retrieve the v
 GEOMETRY
 "
 
-"Data Types","INTERVAL YEAR Type","
+"Data Types","INTERVAL Types","
+intervalYearType | intervalMonthType | intervalDayType
+    | intervalHourType| intervalMinuteType | intervalSecondType
+    | intervalYearToMonthType | intervalDayToHourType
+    | intervalDayToMinuteType | intervalDayToSecondType
+    | intervalHourToMinuteType | intervalHourToSecondType
+    | intervalMinuteToSecondType
+","
+Interval data types.
+There are two classes of intervals. Year-month intervals can store years or months.
+Day-time intervals can store days, hours, minutes, and seconds.
+Year-month intervals are comparable only with another year-month intervals.
+Day-time intervals are comparable only with another day-time intervals.
+
+Mapped to ""org.h2.api.Interval"".
+","
+INTERVAL DAY TO SECOND
+"
+
+"Interval Data Types","INTERVAL YEAR Type","
 INTERVAL YEAR [ ( precisionInt ) ]
 ","
 Interval data type.
@@ -3059,7 +3078,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL YEAR
 "
 
-"Data Types","INTERVAL MONTH Type","
+"Interval Data Types","INTERVAL MONTH Type","
 INTERVAL MONTH [ ( precisionInt ) ]
 ","
 Interval data type.
@@ -3070,7 +3089,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL MONTH
 "
 
-"Data Types","INTERVAL DAY Type","
+"Interval Data Types","INTERVAL DAY Type","
 INTERVAL DAY [ ( precisionInt ) ]
 ","
 Interval data type.
@@ -3082,7 +3101,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL DAY
 "
 
-"Data Types","INTERVAL HOUR Type","
+"Interval Data Types","INTERVAL HOUR Type","
 INTERVAL HOUR [ ( precisionInt ) ]
 ","
 Interval data type.
@@ -3094,7 +3113,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL HOUR
 "
 
-"Data Types","INTERVAL MINUTE Type","
+"Interval Data Types","INTERVAL MINUTE Type","
 INTERVAL MINUTE [ ( precisionInt ) ]
 ","
 Interval data type.
@@ -3106,7 +3125,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL MINUTE
 "
 
-"Data Types","INTERVAL SECOND Type","
+"Interval Data Types","INTERVAL SECOND Type","
 INTERVAL SECOND [ ( precisionInt [, fractionalPrecisionInt ] ) ]
 ","
 Interval data type.
@@ -3119,7 +3138,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL SECOND
 "
 
-"Data Types","INTERVAL YEAR TO MONTH Type","
+"Interval Data Types","INTERVAL YEAR TO MONTH Type","
 INTERVAL YEAR [ ( precisionInt ) ] TO MONTH
 ","
 Interval data type.
@@ -3130,7 +3149,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL YEAR TO MONTH
 "
 
-"Data Types","INTERVAL DAY TO HOUR Type","
+"Interval Data Types","INTERVAL DAY TO HOUR Type","
 INTERVAL DAY [ ( precisionInt ) ] TO HOUR
 ","
 Interval data type.
@@ -3142,7 +3161,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL DAY TO HOUR
 "
 
-"Data Types","INTERVAL DAY TO MINUTE Type","
+"Interval Data Types","INTERVAL DAY TO MINUTE Type","
 INTERVAL DAY [ ( precisionInt ) ] TO MINUTE
 ","
 Interval data type.
@@ -3154,7 +3173,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL DAY TO MINUTE
 "
 
-"Data Types","INTERVAL DAY TO SECOND Type","
+"Interval Data Types","INTERVAL DAY TO SECOND Type","
 INTERVAL DAY [ ( precisionInt ) ] TO SECOND [ ( fractionalPrecisionInt ) ]
 ","
 Interval data type.
@@ -3167,7 +3186,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL DAY TO SECOND
 "
 
-"Data Types","INTERVAL HOUR TO MINUTE Type","
+"Interval Data Types","INTERVAL HOUR TO MINUTE Type","
 INTERVAL HOUR [ ( precisionInt ) ] TO MINUTE
 ","
 Interval data type.
@@ -3179,7 +3198,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL HOUR TO MINUTE
 "
 
-"Data Types","INTERVAL HOUR TO SECOND Type","
+"Interval Data Types","INTERVAL HOUR TO SECOND Type","
 INTERVAL HOUR [ ( precisionInt ) ] TO SECOND [ ( fractionalPrecisionInt ) ]
 ","
 Interval data type.
@@ -3192,7 +3211,7 @@ Mapped to ""org.h2.api.Interval"".
 INTERVAL HOUR TO SECOND
 "
 
-"Data Types","INTERVAL MINUTE TO SECOND Type","
+"Interval Data Types","INTERVAL MINUTE TO SECOND Type","
 INTERVAL * [ ( precisionInt ) ] TO SECOND [ ( fractionalPrecisionInt ) ]
 ","
 Interval data type.

h2/src/docsrc/html/datatypes.html

@@ -71,6 +71,28 @@ syntax-end -->
 <p class="notranslate">${item.example}</p>
 </c:forEach>
 
+<h2>Interval Data Types</h2>
+
+<c:forEach var="item" items="intervalDataTypes">
+<h3 id="${item.link}" class="notranslate" onclick="switchBnf(this)">${item.topic}</h3>
+<!-- railroad-start -->
+<pre name="bnf" style="display: none">
+${item.syntax}
+</pre>
+<div name="railroad">
+${item.railroad}
+</div>
+<!-- railroad-end -->
+<!-- syntax-start
+<pre>
+${item.syntax}
+</pre>
+syntax-end -->
+<p>${item.text}</p>
+<p>Example:</p>
+<p class="notranslate">${item.example}</p>
+</c:forEach>
+
 <!--[if lte IE 7]><script language="javascript">switchBnf(null);</script><![endif]-->
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/tools/org/h2/build/doc/BnfSyntax.java

@@ -68,9 +68,10 @@ public class BnfSyntax implements BnfVisitor {
             return token;
         }
         String page = "grammar.html";
-        if (found.getSection().startsWith("Data Types")) {
+        String section = found.getSection();
+        if (section.startsWith("Data Types") || section.startsWith("Interval Data Types")) {
             page = "datatypes.html";
-        } else if (found.getSection().startsWith("Functions")) {
+        } else if (section.startsWith("Functions")) {
             page = "functions.html";
         } else if (token.equals("@func@")) {
             return "<a href=\"functions.html\">Function</a>";

h2/src/tools/org/h2/build/doc/GenerateDoc.java

@@ -92,6 +92,8 @@ public class GenerateDoc {
                 help + "= 'Functions (System)' ORDER BY ID", true);
         map("dataTypes",
                 help + "LIKE 'Data Types%' ORDER BY SECTION, ID", true);
+        map("intervalDataTypes",
+                help + "LIKE 'Interval Data Types%' ORDER BY SECTION, ID", true);
         map("informationSchema", "SELECT TABLE_NAME TOPIC, " +
                 "GROUP_CONCAT(COLUMN_NAME " +
                 "ORDER BY ORDINAL_POSITION SEPARATOR ', ') SYNTAX " +