HTML railroad diagrams

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The documentation is no longer available in Japanese because the
+<ul><li>The SQL syntax is documented using (railroad) diagrams.
+    The diagrams are HTML.
+</li><li>The documentation is no longer available in Japanese because the
     translation was too much out of sync. Please use the Google translation instead.
 </li></ul>
 

h2/src/docsrc/html/faq.html

@@ -35,6 +35,8 @@ Frequently Asked Questions
     Is it Reliable?</a><br />
 <a href="#slow_open">
     Why is Opening my Database Slow?</a><br />
+<a href="#column_names_incorrect">
+    Column Names are Incorrect?</a><br />
 <a href="#gcj">
     Is the GCJ Version Stable? Faster?</a><br />
 <a href="#translate">
@@ -177,6 +179,22 @@ See also: <a href="grammar.html#set_log" class="notranslate">SET LOG</a>. This p
 using the new 'page store' mechanism (currently beta).
 </p>
 
+<h3 id="column_names_incorrect">Column Names are Incorrect?</h3>
+<p>
+For the query <code>SELECT ID AS X FROM TEST</code> the method
+<code>ResultSetMetaData.getColumnName()</code> returns <code>ID</code>, I expect it to
+return <code>X</code>. What's wrong?
+</p>
+<p>
+This is not a bug. According the the JDBC specification, the method
+<code>ResultSetMetaData.getColumnName()</code> should return the name of the column
+and not the alias name. If you need the alias name, use 
+<a href="http://java.sun.com/javase/6/docs/api/java/sql/ResultSetMetaData.html#getColumnLabel(int)"><code>ResultSetMetaData.getColumnLabel()</code></a>.
+Other database don't work like this (they don't follow the JDBC standard). 
+If you need compatibility with those databases, use the <a href="features.html#compatibility">Compatibility Mode</a>, 
+or set the system property <a href="../javadoc/org/h2/constant/SysProperties.html#h2.aliasColumnName"><code>h2.aliasColumnName</code></a>.
+</p>
+
 <h3 id="slow_open">Why is Opening my Database Slow?</h3>
 <p>
 If it takes a long time to open a database, in most cases it was not closed the last time.

h2/src/docsrc/html/fragments.html

@@ -31,7 +31,7 @@ translate -->
     </tr>
     <tr class="search">
         <td class="search" colspan="2">
-        <b> Search: </b>
+        <b>Search:</b>
         </td>
     </tr>
     <tr class="search">
@@ -42,7 +42,7 @@ translate -->
     </tr>
     <tr class="search" style="display:none;" >
         <td class="search" style="width: 1%; vertical-align: middle;"><input id = "highlight" type="checkbox" checked="checked" onclick="highlightCurrent(this.checked, search.value)" /></td>
-        <td class="search" style="width: 99%; padding: 0px; vertical-align: middle;"> Highlight keyword(s) </td>
+        <td class="search" style="width: 99%; padding: 0px; vertical-align: middle;">Highlight keyword(s)</td>
     </tr>
     <tr class="search">
         <td class="search" colspan="2">
@@ -54,31 +54,31 @@ translate -->
 </table>
 </form>
 <div class="menu">
-<b><a href="main.html"> Home </a></b><br />
-<a href="quickstart.html"> Quickstart </a><br />
-<a href="cheatSheet.html"> Cheat Sheet </a><br />
-<a href="installation.html"> Installation </a><br />
-<a href="tutorial.html"> Tutorial </a><br />
-<a href="features.html"> Features </a><br />
-<a href="performance.html"> Performance </a><br />
-<a href="advanced.html"> Advanced </a><br />
-<a href="jaqu.html"> JaQu </a><br />
-<a href="download.html"> Download </a><br />
+<b><a href="main.html">Home</a></b><br />
+<a href="quickstart.html">Quickstart</a><br />
+<a href="cheatSheet.html">Cheat Sheet</a><br />
+<a href="installation.html">Installation</a><br />
+<a href="tutorial.html">Tutorial</a><br />
+<a href="features.html">Features</a><br />
+<a href="performance.html">Performance</a><br />
+<a href="advanced.html">Advanced</a><br />
+<a href="jaqu.html">JaQu</a><br />
+<a href="download.html">Download</a><br />
 <br />
 <b> Reference </b><br />
-<a href="grammar.html"> SQL Grammar </a><br />
-<a href="functions.html"> Functions </a><br />
-<a href="datatypes.html"> Data Types </a><br />
-<a href="../javadoc/index.html"> Javadoc </a><br />
-<a href="sourceError.html"> Error Analyzer </a><br />
-<a href="../h2.pdf"> PDF (1 MB) </a><br />
+<a href="grammar.html">SQL Grammar</a><br />
+<a href="functions.html">Functions</a><br />
+<a href="datatypes.html">Data Types</a><br />
+<a href="../javadoc/index.html">Javadoc</a><br />
+<a href="sourceError.html">Error Analyzer</a><br />
+<a href="../h2.pdf">PDF (1 MB)</a><br />
 <br />
 <b> Appendix </b><br />
-<a href="build.html"> Build </a><br />
-<a href="history.html"> History &amp; Roadmap </a><br />
-<a href="links.html"> Links </a><br />
-<a href="faq.html"> FAQ </a><br />
-<a href="license.html"> License </a><br />
+<a href="build.html">Build</a><br />
+<a href="history.html">History &amp; Roadmap</a><br />
+<a href="links.html">Links</a><br />
+<a href="faq.html">FAQ</a><br />
+<a href="license.html">License</a><br />
 <br />
 
 </div>

h2/src/test/org/h2/test/server/TestWeb.java

@@ -76,7 +76,7 @@ public class TestWeb extends TestBase {
         assertContains(result, "TEST");
         result = client.get(url, "autoCompleteList.do?query=select * from ");
         assertContains(result, "test");
-        result = client.get(url, "autoCompleteList.do?query=from test t select t.");
+        result = client.get(url, "autoCompleteList.do?query=select * from test t where t.");
         assertContains(result, "id");
         result = client.get(url, "autoCompleteList.do?query=select id x from test te where t");
         assertContains(result, "te");