Fix for TEXT format.

Author: mwinkels-bol

src/main/java/io/r2dbc/postgresql/codec/InstantCodec.java

@@ -37,7 +37,7 @@ final class InstantCodec extends AbstractTemporalCodec<Instant> {
     private final Supplier<ZoneId> zoneIdSupplier;
 
     InstantCodec(ByteBufAllocator byteBufAllocator, Supplier<ZoneId> zoneIdSupplier) {
-        super(Instant.class, byteBufAllocator, TIMESTAMPTZ, TIMESTAMPTZ_ARRAY, Instant::toString);
+        super(Instant.class, byteBufAllocator, TIMESTAMPTZ, TIMESTAMPTZ_ARRAY, PostgresqlDateTimeFormatter::format);
         this.zoneIdSupplier = zoneIdSupplier;
     }
 

src/main/java/io/r2dbc/postgresql/codec/PostgresqlDateTimeFormatter.java

@@ -16,25 +16,30 @@
 
 package io.r2dbc.postgresql.codec;
 
+import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
 import java.time.format.SignStyle;
+import java.time.temporal.Temporal;
 import java.time.temporal.TemporalQuery;
 
+import static java.time.ZoneOffset.UTC;
+import static java.time.format.TextStyle.SHORT;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
 import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.NANO_OF_SECOND;
 import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
-import static java.time.temporal.ChronoField.YEAR;
+import static java.time.temporal.ChronoField.YEAR_OF_ERA;
 
 class PostgresqlDateTimeFormatter {
 
     private static final DateTimeFormatter FULL_OFFSET =
         new DateTimeFormatterBuilder()
-            .appendValue(YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
+            .appendValue(YEAR_OF_ERA, 4, 10, SignStyle.NEVER)
             .appendLiteral('-')
             .appendValue(MONTH_OF_YEAR, 2)
             .appendLiteral('-')
@@ -52,11 +57,15 @@ class PostgresqlDateTimeFormatter {
             .optionalStart()
             .appendOffset("+HH:MM:ss", "+00:00:00")
             .optionalEnd()
+            .optionalStart()
+            .appendLiteral(' ')
+            .appendText(ERA, SHORT)
+            .optionalEnd()
             .toFormatter();
 
     private static final DateTimeFormatter SHORT_OFFSET =
         new DateTimeFormatterBuilder()
-            .appendValue(YEAR, 4, 10, SignStyle.EXCEEDS_PAD)
+            .appendValue(YEAR_OF_ERA, 4, 10, SignStyle.NEVER)
             .appendLiteral('-')
             .appendValue(MONTH_OF_YEAR, 2)
             .appendLiteral('-')
@@ -74,6 +83,10 @@ class PostgresqlDateTimeFormatter {
             .optionalStart()
             .appendOffset("+HH:mm", "+00:00")
             .optionalEnd()
+            .optionalStart()
+            .appendLiteral(' ')
+            .appendText(ERA, SHORT)
+            .optionalEnd()
             .toFormatter();
 
     /**
@@ -104,4 +117,11 @@ static <T> T parse(CharSequence text, TemporalQuery<T> query) {
         }
     }
 
+    static String format(Temporal temporal) {
+        if (temporal instanceof Instant) {
+            temporal = ((Instant) temporal).atOffset(UTC);
+        }
+        return SHORT_OFFSET.format(temporal);
+    }
+
 }

src/test/java/io/r2dbc/postgresql/codec/InstantCodecUnitTests.java

@@ -126,7 +126,7 @@ void doEncode() {
         assertThat(this.codec.doEncode(instant))
             .hasFormat(FORMAT_TEXT)
             .hasType(TIMESTAMPTZ.getObjectId())
-            .hasValue(encode(TEST, instant.toString()));
+            .hasValue(encode(TEST, PostgresqlDateTimeFormatter.format(instant)));
     }
 
     @Test