fix: revert removal of toOffsetDateTime(String timestamp) fixes #Issue 2497 (#2501)

davecramer · web-flow · commit 4d711c2a9717 · 2022-05-02T18:47:20.000-04:00
* fix: revert removal of toOffsetDateTime(String timestamp)  fixes #Issue 2497

* resurrected OffsetDateTime toOffsetDateTime(Time t) for completeness

* move handling of UTC for string OffsetDateTime to call site to retain the original function signature of TimestampUtils.toOffsetDateTime

* check for +/- infinity before setting timezone to UTC
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
@@ -74,6 +74,7 @@
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -671,8 +672,19 @@ public int getConcurrency() throws SQLException {
       }
     } else {
       // string
-      if (oid == Oid.TIMESTAMPTZ || oid == Oid.TIMESTAMP || oid == Oid.TIMETZ) {
-        return getTimestampUtils().toOffsetDateTime(castNonNull(getString(i)), oid != Oid.TIMETZ);
+
+      if (oid == Oid.TIMESTAMPTZ || oid == Oid.TIMESTAMP )  {
+
+        OffsetDateTime offsetDateTime = getTimestampUtils().toOffsetDateTime(castNonNull(getString(i)));
+        if ( offsetDateTime != OffsetDateTime.MAX && offsetDateTime != OffsetDateTime.MIN ) {
+          return offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC);
+        } else {
+          return offsetDateTime;
+        }
+
+      }
+      if ( oid == Oid.TIMETZ ) {
+        return getTimestampUtils().toOffsetDateTime(castNonNull(getString(i)));
       }
     }
 
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java b/pgjdbc/src/main/java/org/postgresql/jdbc/TimestampUtils.java
@@ -516,17 +516,30 @@ public OffsetTime toOffsetTimeBin(byte[] bytes) throws PSQLException {
     }
   }
 
+  /**
+   * Returns the offset date time object matching the given bytes with Oid#TIMETZ.
+   * Not used internally anymore, function is here to retain compatibility with previous versions
+   *
+   * @param t the time value
+   * @return the matching offset date time
+   * @deprecated was used internally, and not used anymore
+   */
+  @Deprecated
+  public OffsetDateTime toOffsetDateTime(Time t) {
+    // hardcode utc because the backend does not provide us the timezone
+    // hardcode UNIX epoch, JDBC requires OffsetDateTime but doesn't describe what date should be used
+    return t.toLocalTime().atDate(LocalDate.of(1970, 1, 1)).atOffset(ZoneOffset.UTC);
+  }
+
   /**
    * Parse a string and return a OffsetDateTime representing its value.
    *
-   * @param s The ISO formated date string to parse.
-   * @param adaptToUTC if true the timezone is adapted to be UTC;
-   *     this must be done for timestamp and timestamptz as they have no zone on server side
+   * @param s The ISO formatted date string to parse.
    * @return null if s is null or a OffsetDateTime of the parsed string s.
    * @throws SQLException if there is a problem parsing s.
    */
   public @PolyNull OffsetDateTime toOffsetDateTime(
-      @PolyNull String s, boolean adaptToUTC) throws SQLException {
+      @PolyNull String s) throws SQLException {
     if (s == null) {
       return null;
     }
@@ -545,9 +558,6 @@ public OffsetTime toOffsetTimeBin(byte[] bytes) throws PSQLException {
     final ParsedTimestamp ts = parseBackendTimestamp(s);
     OffsetDateTime result =
         OffsetDateTime.of(ts.year, ts.month, ts.day, ts.hour, ts.minute, ts.second, ts.nanos, ts.offset);
-    if (adaptToUTC) {
-      result = result.withOffsetSameInstant(ZoneOffset.UTC);
-    }
     if (ts.era == GregorianCalendar.BC) {
       return result.with(ChronoField.ERA, IsoEra.BCE.getValue());
     } else {
