setTimestamp use timestamptz db type

.gitignore

@@ -30,4 +30,6 @@ dependency-reduced-pom.xml
 buildNumber.properties
 
 # Ignore folders used to build binaries for old Java
+bin
 /eclipsebin/
+

pgjdbc/src/main/java/org/postgresql/PGProperty.java

@@ -600,6 +600,15 @@ public enum PGProperty {
       "0",
       "The timeout value in seconds max(2147484) used for socket read operations."),
 
+  /**
+   * If true it uses time stamp with time zone type always for java sql Timestamp
+   * The default is {@code false} for compatibility.
+   */
+  SQL_TIMESTAMPTZ_ALWAYS(
+      "sqlTimestamptzAlways",
+      "false",
+      "If true it uses time stamp with time zone type for java Timestamp. The default is (@code false)"),
+
   /**
    * Control use of SSL: empty or {@code true} values imply {@code sslmode==verify-full}
    */

pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java

@@ -1849,4 +1849,12 @@ public void setCleanupSavePoints(final boolean cleanupSavepoints) {
   public boolean isReWriteBatchedInserts() {
     return getReWriteBatchedInserts();
   }
+
+  public boolean isSqlTimestamptzAlways() {
+    return PGProperty.SQL_TIMESTAMPTZ_ALWAYS.getBoolean(properties);
+  }
+
+  public void setSqlTimestamptzAlways(boolean sqlTimestamptzAlways) {
+    PGProperty.SQL_TIMESTAMPTZ_ALWAYS.set(properties, sqlTimestamptzAlways);
+  }
 }

pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java

@@ -202,6 +202,8 @@ private enum ReadOnlyBehavior {
   private final boolean logServerErrorDetail;
   // Bind String to UNSPECIFIED or VARCHAR?
   private final boolean bindStringAsVarchar;
+  // Uses timestamptz always for java sql Timestamp
+  private final boolean sqlTimestamptzAlways;
 
   // Current warnings; there might be more on queryExecutor too.
   private @Nullable SQLWarning firstWarning;
@@ -287,6 +289,8 @@ public PgConnection(HostSpec[] hostSpecs,
 
     this.hideUnprivilegedObjects = PGProperty.HIDE_UNPRIVILEGED_OBJECTS.getBoolean(info);
 
+    this.sqlTimestamptzAlways = PGProperty.SQL_TIMESTAMPTZ_ALWAYS.getBoolean(info);
+
     // get oids that support binary transfer
     Set<Integer> binaryOids = getBinaryEnabledOids(info);
     // get oids that should be disabled from transfer
@@ -1964,4 +1968,8 @@ public PGXmlFactoryFactory getXmlFactoryFactory() throws SQLException {
     this.xmlFactoryFactory = xmlFactoryFactory;
     return xmlFactoryFactory;
   }
+
+  public boolean isSqlTimestamptzAlways() {
+    return sqlTimestamptzAlways;
+  }
 }

pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java

@@ -68,11 +68,13 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Map;
@@ -682,6 +684,10 @@ public void setObject(@Positive int parameterIndex, @Nullable Object in,
           } else if (in instanceof LocalDateTime) {
             setTimestamp(parameterIndex, (LocalDateTime) in);
             break;
+          } else if (in instanceof Instant) {
+            tmpts = Timestamp.from( (Instant) in );
+          } else if (in instanceof ZonedDateTime) {
+            tmpts = Timestamp.valueOf( ((ZonedDateTime) in).toLocalDateTime());
           } else {
             tmpts = getTimestampUtils().toTimestamp(getDefaultCalendar(), in.toString().getBytes());
           }
@@ -693,6 +699,10 @@ public void setObject(@Positive int parameterIndex, @Nullable Object in,
           setTimestamp(parameterIndex, (OffsetDateTime) in);
         } else if (in instanceof PGTimestamp) {
           setObject(parameterIndex, in);
+        } else if (in instanceof Instant) {
+          setTimestamp(parameterIndex, Timestamp.from( (Instant) in ));
+        } else if (in instanceof ZonedDateTime) {
+          setTimestamp(parameterIndex, Timestamp.valueOf(((ZonedDateTime) in).toLocalDateTime()));
         } else {
           throw new PSQLException(
               GT.tr("Cannot cast an instance of {0} to type {1}",
@@ -1035,6 +1045,10 @@ public void setObject(@Positive int parameterIndex, @Nullable Object x) throws S
       setTime(parameterIndex, (Time) x);
     } else if (x instanceof Timestamp) {
       setTimestamp(parameterIndex, (Timestamp) x);
+    } else if (x instanceof Instant ) {
+      setTimestamp(parameterIndex, Timestamp.from((Instant) x ));
+    } else if (x instanceof ZonedDateTime ) {
+      setTimestamp(parameterIndex, ((ZonedDateTime) x).toOffsetDateTime());
     } else if (x instanceof Boolean) {
       setBoolean(parameterIndex, (Boolean) x);
     } else if (x instanceof Byte) {
@@ -1506,6 +1520,10 @@ public void setTimestamp(@Positive int i, @Nullable Timestamp t,
     if (cal == null) {
       cal = getDefaultCalendar();
     }
+
+    if (connection.isSqlTimestamptzAlways()) {
+      oid = Oid.TIMESTAMPTZ;
+    }
     bindString(i, getTimestampUtils().toString(cal, t), oid);
   }
 

pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java

@@ -43,11 +43,16 @@ public enum StringType {
     UNSPECIFIED, VARCHAR
   }
 
+  public enum TimestamptzAlways {
+   YES, NO
+  }
+
   protected Connection con;
   protected BinaryMode binaryMode;
   private ReWriteBatchedInserts reWriteBatchedInserts;
   protected PreferQueryMode preferQueryMode;
   private StringType stringType;
+  private TimestamptzAlways timestamptzAlways;
 
   protected void updateProperties(Properties props) {
     if (binaryMode == BinaryMode.FORCE) {
@@ -59,6 +64,9 @@ protected void updateProperties(Properties props) {
     if (stringType != null) {
       PGProperty.STRING_TYPE.set(props, stringType.name().toLowerCase(Locale.ROOT));
     }
+    if (timestamptzAlways  == TimestamptzAlways.YES) {
+      PGProperty.SQL_TIMESTAMPTZ_ALWAYS.set(props, true);
+    }
   }
 
   protected void forceBinary(Properties props) {
@@ -83,6 +91,10 @@ public void setReWriteBatchedInserts(
     this.reWriteBatchedInserts = reWriteBatchedInserts;
   }
 
+  public void setTimestamptzAlways(TimestamptzAlways timestamptzAlways) {
+    this.timestamptzAlways = timestamptzAlways;
+  }
+
   @Before
   public void setUp() throws Exception {
     Properties props = new Properties();