Revise temporal rendering and parsing in text mode.

We now revised text-encoded temporal value parsing to accomodate for proper timezone and ERA indicators. Also, we now translate infinity and -infinity values into the corresponding MAX (e.g. LocalDateTime.MAX) and MIN values. [resolves #578] Signed-off-by: Mark Paluch <mpaluch@vmware.com>
pgjdbc · Feb 16, 2023 · 1852777 · 1852777
1 parent b6ebc1c
commit 1852777
Show file tree

Hide file tree

Showing 22 changed files with 809 additions and 158 deletions.
diff --git a/src/main/java/io/r2dbc/postgresql/codec/AbstractTemporalCodec.java b/src/main/java/io/r2dbc/postgresql/codec/AbstractTemporalCodec.java
@@ -24,12 +24,10 @@
 import reactor.util.annotation.Nullable;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
 import java.util.EnumSet;
 import java.util.Set;
@@ -118,28 +116,28 @@ private Temporal decodeTemporal(ByteBuf buffer, PostgresqlObjectId dataType, @Nu
                     return EpochTime.fromLong(buffer.readLong()).toLocalDateTime();
                 }
 
-                return PostgresqlDateTimeFormatter.parse(ByteBufUtils.decode(buffer), LocalDateTime::from);
+                return PostgresqlDateTimeFormatter.parseLocalDateTime(ByteBufUtils.decode(buffer));
             case DATE:
             case DATE_ARRAY:
                 if (FORMAT_BINARY == format) {
                     return LocalDate.ofEpochDay(EpochTime.fromInt(buffer.readInt()).getJavaDays());
                 }
 
-                return LocalDate.parse(ByteBufUtils.decode(buffer));
+                return PostgresqlDateTimeFormatter.parseLocalDate(ByteBufUtils.decode(buffer));
             case TIME:
             case TIME_ARRAY:
                 if (FORMAT_BINARY == format) {
                     return LocalTime.ofNanoOfDay(buffer.readLong() * 1000);
                 }
 
-                return LocalTime.parse(ByteBufUtils.decode(buffer));
+                return PostgresqlTimeFormatter.parseLocalTime(ByteBufUtils.decode(buffer));
             case TIMESTAMPTZ:
             case TIMESTAMPTZ_ARRAY:
                 if (FORMAT_BINARY == format) {
                     return EpochTime.fromLong(buffer.readLong()).toInstant().atOffset(OffsetDateTime.now().getOffset());
                 }
 
-                return PostgresqlDateTimeFormatter.parse(ByteBufUtils.decode(buffer), ZonedDateTime::from);
+                return PostgresqlDateTimeFormatter.parseOffsetDateTime(ByteBufUtils.decode(buffer));
             case TIMETZ:
             case TIMETZ_ARRAY:
                 if (FORMAT_BINARY == format) {
@@ -148,7 +146,7 @@ private Temporal decodeTemporal(ByteBuf buffer, PostgresqlObjectId dataType, @Nu
                     return OffsetTime.of(LocalTime.ofNanoOfDay(timeNano), ZoneOffset.ofTotalSeconds(offsetSec));
                 }
 
-                return PostgresqlTimeFormatter.parse(ByteBufUtils.decode(buffer), OffsetTime::from);
+                return PostgresqlTimeFormatter.parseOffsetTime(ByteBufUtils.decode(buffer));
         }
 
         throw new UnsupportedOperationException(String.format("Cannot decode value for type %s, format %s", dataType, format));

diff --git a/src/main/java/io/r2dbc/postgresql/codec/InstantCodec.java b/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, it -> PostgresqlDateTimeFormatter.toString(it));
         this.zoneIdSupplier = zoneIdSupplier;
     }
 

diff --git a/src/main/java/io/r2dbc/postgresql/codec/LocalDateCodec.java b/src/main/java/io/r2dbc/postgresql/codec/LocalDateCodec.java
@@ -33,7 +33,7 @@
 final class LocalDateCodec extends AbstractTemporalCodec<LocalDate> {
 
     LocalDateCodec(ByteBufAllocator byteBufAllocator) {
-        super(LocalDate.class, byteBufAllocator, DATE, DATE_ARRAY, LocalDate::toString);
+        super(LocalDate.class, byteBufAllocator, DATE, DATE_ARRAY, PostgresqlDateTimeFormatter::toString);
     }
 
     @Override

diff --git a/src/main/java/io/r2dbc/postgresql/codec/LocalDateTimeCodec.java b/src/main/java/io/r2dbc/postgresql/codec/LocalDateTimeCodec.java
@@ -37,7 +37,7 @@ final class LocalDateTimeCodec extends AbstractTemporalCodec<LocalDateTime> {
     private final Supplier<ZoneId> zoneIdSupplier;
 
     LocalDateTimeCodec(ByteBufAllocator byteBufAllocator, Supplier<ZoneId> zoneIdSupplier) {
-        super(LocalDateTime.class, byteBufAllocator, TIMESTAMP, TIMESTAMP_ARRAY, LocalDateTime::toString);
+        super(LocalDateTime.class, byteBufAllocator, TIMESTAMP, TIMESTAMP_ARRAY, PostgresqlDateTimeFormatter::toString);
         this.zoneIdSupplier = Assert.requireNonNull(zoneIdSupplier, "zoneIdSupplier must not be null");
     }
 

diff --git a/src/main/java/io/r2dbc/postgresql/codec/LocalTimeCodec.java b/src/main/java/io/r2dbc/postgresql/codec/LocalTimeCodec.java
@@ -33,7 +33,7 @@
 final class LocalTimeCodec extends AbstractTemporalCodec<LocalTime> {
 
     LocalTimeCodec(ByteBufAllocator byteBufAllocator) {
-        super(LocalTime.class, byteBufAllocator, TIME, TIME_ARRAY, LocalTime::toString);
+        super(LocalTime.class, byteBufAllocator, TIME, TIME_ARRAY, PostgresqlTimeFormatter::toString);
     }
 
     @Override

diff --git a/src/main/java/io/r2dbc/postgresql/codec/OffsetDateTimeCodec.java b/src/main/java/io/r2dbc/postgresql/codec/OffsetDateTimeCodec.java
@@ -30,7 +30,7 @@
 final class OffsetDateTimeCodec extends AbstractTemporalCodec<OffsetDateTime> {
 
     OffsetDateTimeCodec(ByteBufAllocator byteBufAllocator) {
-        super(OffsetDateTime.class, byteBufAllocator, TIMESTAMPTZ, TIMESTAMPTZ_ARRAY, OffsetDateTime::toString);
+        super(OffsetDateTime.class, byteBufAllocator, TIMESTAMPTZ, TIMESTAMPTZ_ARRAY, PostgresqlDateTimeFormatter::toString);
     }
 
     @Override

diff --git a/src/main/java/io/r2dbc/postgresql/codec/OffsetTimeCodec.java b/src/main/java/io/r2dbc/postgresql/codec/OffsetTimeCodec.java
@@ -29,7 +29,7 @@
 public class OffsetTimeCodec extends AbstractTemporalCodec<OffsetTime> {
 
     OffsetTimeCodec(ByteBufAllocator byteBufAllocator) {
-        super(OffsetTime.class, byteBufAllocator, TIMETZ, TIMETZ_ARRAY, OffsetTime::toString);
+        super(OffsetTime.class, byteBufAllocator, TIMETZ, TIMETZ_ARRAY, PostgresqlTimeFormatter::toString);
     }
 
     @Override