Allow [timeZoneName] part after time zone offset

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -470,7 +470,12 @@ public class DateTimeUtils {
                     timeZoneStart = s.indexOf('-', dateEnd + 1);
                 }
                 if (timeZoneStart >= 0) {
-                    String tzName = "GMT" + s.substring(timeZoneStart);
+                    // Allow [timeZoneName] part after time zone offset
+                    int offsetEnd = s.indexOf('[', timeZoneStart + 1);
+                    if (offsetEnd < 0) {
+                        offsetEnd = s.length();
+                    }
+                    String tzName = "GMT" + s.substring(timeZoneStart, offsetEnd);
                     tz = TimeZone.getTimeZone(tzName);
                     if (!tz.getID().startsWith(tzName)) {
                         throw new IllegalArgumentException(

h2/src/test/org/h2/test/scripts/datatypes/timestamp-with-timezone.sql

@@ -29,8 +29,9 @@ SELECT * FROM tab_with_timezone ORDER BY X;
 
 SELECT TIMESTAMP WITH TIME ZONE '2000-01-10 00:00:00 -02' AS A,
     TIMESTAMP WITH TIME ZONE '2000-01-10 00:00:00.000000000 +02:00' AS B,
-    TIMESTAMP WITH TIME ZONE '2000-01-10 00:00:00.000000000+02:00' AS C;
-> A                        B                        C
-> ------------------------ ------------------------ ------------------------
-> 2000-01-10 00:00:00.0-02 2000-01-10 00:00:00.0+02 2000-01-10 00:00:00.0+02
+    TIMESTAMP WITH TIME ZONE '2000-01-10 00:00:00.000000000+02:00' AS C,
+    TIMESTAMP WITH TIME ZONE '2000-01-10T00:00:00.000000000+09:00[Asia/Tokyo]' AS D;
+> A                        B                        C                        D
+> ------------------------ ------------------------ ------------------------ ------------------------
+> 2000-01-10 00:00:00.0-02 2000-01-10 00:00:00.0+02 2000-01-10 00:00:00.0+02 2000-01-10 00:00:00.0+09
 > rows: 1