Properly implement TZR and TZD in TO_CHAR for TIMESTAMP WITH TIME ZONE

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

@@ -18,6 +18,7 @@ import java.util.TimeZone;
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
 import org.h2.value.Value;
+import org.h2.value.ValueTimestampTimeZone;
 
 /**
  * Emulates Oracle's TO_CHAR function.
@@ -754,11 +755,13 @@ public class ToChar {
                 // Time zone
 
             } else if (containsAt(format, i, "TZR") != null) {
-                TimeZone tz = TimeZone.getDefault();
+                TimeZone tz = value instanceof ValueTimestampTimeZone ?
+                        ((ValueTimestampTimeZone) value).getTimeZone() : TimeZone.getDefault();
                 output.append(tz.getID());
                 i += 3;
             } else if (containsAt(format, i, "TZD") != null) {
-                TimeZone tz = TimeZone.getDefault();
+                TimeZone tz = value instanceof ValueTimestampTimeZone ?
+                        ((ValueTimestampTimeZone) value).getTimeZone() : TimeZone.getDefault();
                 boolean daylight = tz.inDaylightTime(new java.util.Date());
                 output.append(tz.getDisplayName(daylight, TimeZone.SHORT));
                 i += 3;

h2/src/main/org/h2/value/ValueTimestampTimeZone.java

@@ -15,6 +15,7 @@ import org.h2.api.ErrorCode;
 import org.h2.api.TimestampWithTimeZone;
 import org.h2.message.DbException;
 import org.h2.util.DateTimeUtils;
+import org.h2.util.StringUtils;
 
 /**
  * Implementation of the TIMESTAMP WITH TIME ZONE data type.
@@ -158,7 +159,18 @@ public class ValueTimestampTimeZone extends Value {
         if (offset == 0) {
             return DateTimeUtils.UTC;
         }
-        return new SimpleTimeZone(offset * 60000, Integer.toString(offset));
+        StringBuilder b = new StringBuilder(9);
+        b.append("GMT");
+        if (offset < 0) {
+            b.append('-');
+            offset = - offset;
+        } else {
+            b.append('+');
+        }
+        StringUtils.appendZeroPadded(b, 2, offset / 60);
+        b.append(':');
+        StringUtils.appendZeroPadded(b, 2, offset % 60);
+        return new SimpleTimeZone(offset * 60000, b.toString());
     }
 
     @Override

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -1619,6 +1619,10 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         assertResult(expected, stat, "SELECT TO_CHAR(X, 'TS') FROM T");
         assertResult(tzLongName, stat, "SELECT TO_CHAR(X, 'TZR') FROM T");
         assertResult(tzShortName, stat, "SELECT TO_CHAR(X, 'TZD') FROM T");
+        assertResult("GMT+10:30", stat,
+                "SELECT TO_CHAR(TIMESTAMP WITH TIME ZONE '2010-01-01 0:00:00+10:30', 'TZR')");
+        assertResult("GMT+10:30", stat,
+                "SELECT TO_CHAR(TIMESTAMP WITH TIME ZONE '2010-01-01 0:00:00+10:30', 'TZD')");
         expected = String.format("%f", 1.1).substring(1, 2);
         assertResult(expected, stat, "SELECT TO_CHAR(X, 'X') FROM T");
         expected = String.format("%,d", 1979);