--no commit message

--no commit message

h2/src/docsrc/html/history.html

@@ -44,7 +44,8 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
 </ul>
 
 <h3>Version 1.0 / 2007-08-02</h3><ul>
-<li>OpenOffice compatibility: support database name in column names.
+<li>The column name C_CURRENT_TIMESTAMP did not work in the last release.
+</li><li>OpenOffice compatibility: support database name in column names.
 </li><li>A new tool to help translation has been implemented: src/tools/org/h2/tools/i18n/PrepareTranslation.
     This tool can detect delta changes in the original (English) and prepends '#' in translation if the original
     text was changed. It can also extract text from the user documentation (however, it is incomplete).

h2/src/main/org/h2/command/Parser.java

@@ -1854,7 +1854,6 @@ public class Parser {
             return expr;
         }
         String name = readColumnIdentifier();
-int supportDatabaseSchema;        
         if(readIf(".")) {
             String schemaName = objectName;
             objectName = name;
@@ -2748,11 +2747,11 @@ int supportDatabaseSchema;
     private static int getSaveTokenType(String s) {
         switch (s.charAt(0)) {
         case 'C':
-            if(s.endsWith("CURRENT_TIMESTAMP")) {
+            if(s.equals("CURRENT_TIMESTAMP")) {
                 return CURRENT_TIMESTAMP;
-            } else if(s.endsWith("CURRENT_TIME")) {
+            } else if(s.equals("CURRENT_TIME")) {
                 return CURRENT_TIME;
-            } else if(s.endsWith("CURRENT_DATE")) {
+            } else if(s.equals("CURRENT_DATE")) {
                 return CURRENT_DATE;
             }
             return getKeywordOrIdentifier(s, "CROSS", KEYWORD);
@@ -2812,11 +2811,11 @@ int supportDatabaseSchema;
         case 'R':
             return getKeywordOrIdentifier(s, "ROWNUM", ROWNUM);
         case 'S':
-            if(s.endsWith("SYSTIMESTAMP")) {
+            if(s.equals("SYSTIMESTAMP")) {
                 return CURRENT_TIMESTAMP;
-            } else if(s.endsWith("SYSTIME")) {
+            } else if(s.equals("SYSTIME")) {
                 return CURRENT_TIME;
-            } else if(s.endsWith("SYSDATE")) {
+            } else if(s.equals("SYSDATE")) {
                 return CURRENT_DATE;
             }
             return getKeywordOrIdentifier(s, "SELECT", KEYWORD);