Add support to parse timestamps with +hh:mm:ss offset.

[resolves #509][#510]
pgjdbc · May 17, 2022 · d748e92 · d748e92
1 parent faff3cc
commit d748e92
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/io/r2dbc/postgresql/codec/PostgresqlDateTimeFormatter.java b/src/main/java/io/r2dbc/postgresql/codec/PostgresqlDateTimeFormatter.java
@@ -48,7 +48,7 @@ class PostgresqlDateTimeFormatter {
             .appendFraction(NANO_OF_SECOND, 0, 9, true)
             .optionalEnd()
             .optionalStart()
-            .appendOffset("+HH:mm", "+00:00")
+            .appendOffset("+HH:mm:ss", "+00:00:00")
             .optionalEnd()
             .toFormatter();
 

diff --git a/src/test/java/io/r2dbc/postgresql/codec/InstantCodecUnitTests.java b/src/test/java/io/r2dbc/postgresql/codec/InstantCodecUnitTests.java
@@ -66,6 +66,8 @@ void decodeFromTimestampWithTimezone() {
         ZonedDateTime zonedDateTime = ZonedDateTime.parse("2018-11-05T00:20:25.039883+09:00[Asia/Tokyo]");
         Instant instant = zonedDateTime.toInstant();
 
+        assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+09:00:00"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))
+                .isEqualTo(instant);
         assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+09:00"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))
             .isEqualTo(instant);
         assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+09"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))
@@ -77,6 +79,8 @@ void decodeFromTimestampWithTimezoneUTC() {
         ZonedDateTime zonedDateTime = ZonedDateTime.parse("2018-11-05T00:20:25.039883+00:00");
         Instant instant = zonedDateTime.toInstant();
 
+        assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+00:00:00"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))
+                .isEqualTo(instant);
         assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+00:00"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))
             .isEqualTo(instant);
         assertThat(new InstantCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+00"), TIMESTAMPTZ.getObjectId(), FORMAT_TEXT, Instant.class))

diff --git a/src/test/java/io/r2dbc/postgresql/codec/LocalDateTimeCodecUnitTests.java b/src/test/java/io/r2dbc/postgresql/codec/LocalDateTimeCodecUnitTests.java
@@ -62,6 +62,8 @@ void decodeUTC() {
             .isEqualTo(localDateTime);
         assertThat(new LocalDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:06:31.700426+00"), dataType, FORMAT_TEXT, LocalDateTime.class))
             .isEqualTo(localDateTime);
+        assertThat(new LocalDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:06:31.700426+00:00:00"), dataType, FORMAT_TEXT, LocalDateTime.class))
+                .isEqualTo(localDateTime);
     }
 
     @Test

diff --git a/src/test/java/io/r2dbc/postgresql/codec/OffsetDateTimeCodecUnitTests.java b/src/test/java/io/r2dbc/postgresql/codec/OffsetDateTimeCodecUnitTests.java
@@ -52,6 +52,8 @@ void decode() {
 
         assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+09:00"), dataType, FORMAT_TEXT, OffsetDateTime.class))
             .isEqualTo(offsetDateTime);
+        assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+09:00:00"), dataType, FORMAT_TEXT, OffsetDateTime.class))
+                .isEqualTo(offsetDateTime);
         assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+09"), dataType, FORMAT_TEXT, OffsetDateTime.class))
             .isEqualTo(offsetDateTime);
     }
@@ -62,6 +64,8 @@ void decodeUTC() {
 
         assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+00:00"), dataType, FORMAT_TEXT, OffsetDateTime.class))
             .isEqualTo(offsetDateTime);
+        assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+00:00:00"), dataType, FORMAT_TEXT, OffsetDateTime.class))
+                .isEqualTo(offsetDateTime);
         assertThat(new OffsetDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:16:00.899797+00"), dataType, FORMAT_TEXT, OffsetDateTime.class))
             .isEqualTo(offsetDateTime);
     }

diff --git a/src/test/java/io/r2dbc/postgresql/codec/ZonedDateTimeCodecUnitTests.java b/src/test/java/io/r2dbc/postgresql/codec/ZonedDateTimeCodecUnitTests.java
@@ -54,6 +54,8 @@ void decode() {
             .isEqualTo(zonedDateTime);
         assertThat(new ZonedDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+09"), dataType, FORMAT_TEXT, ZonedDateTime.class))
             .isEqualTo(zonedDateTime);
+        assertThat(new ZonedDateTimeCodec(TEST).decode(encode(TEST, "2018-11-05 00:20:25.039883+09:00:00"), dataType, FORMAT_TEXT, ZonedDateTime.class))
+                .isEqualTo(zonedDateTime);
     }
 
     @Test