Restore possibility to use TIMESTAMP as a column name

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

@@ -3149,17 +3149,22 @@ public class Parser {
                         read();
                         r = ValueExpression.get(ValueTimestampTimeZone.parse(timestamp));
                     } else {
-                        if (readIf("WITHOUT")) {
+                        boolean without = readIf("WITHOUT");
+                        if (without) {
                             read("TIME");
                             read("ZONE");
                         }
                         if (currentTokenType != VALUE
                                 || currentValue.getType() != Value.STRING) {
-                            throw getSyntaxError();
+                            if (without) {
+                                throw getSyntaxError();
+                            }
+                            r = new ExpressionColumn(database, null, null, name);
+                        } else {
+                            String timestamp = currentValue.getString();
+                            read();
+                            r = ValueExpression.get(ValueTimestamp.parse(timestamp, database.getMode()));
                         }
-                        String timestamp = currentValue.getString();
-                        read();
-                        r = ValueExpression.get(ValueTimestamp.parse(timestamp, database.getMode()));
                     }
                 } else if (currentTokenType == VALUE &&
                         currentValue.getType() == Value.STRING) {

h2/src/test/org/h2/test/scripts/datatypes/timestamp.sql

@@ -25,3 +25,19 @@ SELECT COLUMN_NAME, DATA_TYPE, TYPE_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.CO
 
 DROP TABLE TEST;
 > ok
+
+-- Check that TIMESTAMP is allowed as a column name
+CREATE TABLE TEST(TIMESTAMP TIMESTAMP);
+> ok
+
+INSERT INTO TEST VALUES (TIMESTAMP '1999-12-31 08:00:00');
+> update count: 1
+
+SELECT TIMESTAMP FROM TEST;
+> TIMESTAMP
+> ---------------------
+> 1999-12-31 08:00:00.0
+> rows: 1
+
+DROP TABLE TEST;
+> ok