correct mapping for postgres timestamptz type to sql type TIMESTAMP_W…

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

@@ -600,6 +600,16 @@ public enum PGProperty {
       "0",
       "The timeout value in seconds max(2147484) used for socket read operations."),
 
+  /**
+   * Enable or disable mapping of PG types with TIMEZONE into SQL types with TIMEZONE.
+   * The default is {@code false}
+   */
+  SQL_TYPES_WITH_TIMEZONE(
+      "sqlTypesWithTimezone",
+      "false",
+      "Enable or disable mapping of PG types with TIMEZONE into SQL types with TIMEZONE."
+          + "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

@@ -591,6 +591,22 @@ public int getSocketTimeout() {
     return PGProperty.SOCKET_TIMEOUT.getIntNoCheck(properties);
   }
 
+  /**
+   * @param enabled if PG types with TIMEZONE should map into SQL types with TIMEZONE
+   * @see PGProperty#SQL_TYPES_WITH_TIMEZONE
+   */
+  public void setSqlTypesWithTimezone(boolean enabled) {
+    PGProperty.SQL_TYPES_WITH_TIMEZONE.set(properties, enabled);
+  }
+
+  /**
+   * @return true if SQL types with TIMEZONE is enabled
+   * @see PGProperty#SQL_TYPES_WITH_TIMEZONE
+   */
+  public boolean getSqlTypesWithTimezone() {
+    return PGProperty.SQL_TYPES_WITH_TIMEZONE.getBoolean(properties);
+  }
+
   /**
    * @param seconds timeout that is used for sending cancel command
    * @see PGProperty#CANCEL_SIGNAL_TIMEOUT

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

@@ -346,10 +346,11 @@ public PgConnection(HostSpec[] hostSpecs,
     rollbackQuery = createQuery("ROLLBACK", false, true).query;
 
     int unknownLength = PGProperty.UNKNOWN_LENGTH.getInt(info);
+    boolean sqlTypesWithTimezone = PGProperty.SQL_TYPES_WITH_TIMEZONE.getBoolean(info);
 
     // Initialize object handling
     @SuppressWarnings("argument")
-    TypeInfo typeCache = createTypeInfo(this, unknownLength);
+    TypeInfo typeCache = createTypeInfo(this, unknownLength,sqlTypesWithTimezone);
     this.typeCache = typeCache;
     initObjectTypes(info);
 
@@ -777,8 +778,8 @@ public Object getObject(String type, @Nullable String value, byte @Nullable [] b
     }
   }
 
-  protected TypeInfo createTypeInfo(BaseConnection conn, int unknownLength) {
-    return new TypeInfoCache(conn, unknownLength);
+  protected TypeInfo createTypeInfo(BaseConnection conn, int unknownLength,boolean sqlTypesWithTimezone) {
+    return new TypeInfoCache(conn, unknownLength,sqlTypesWithTimezone);
   }
 
   @Override

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

@@ -244,8 +244,10 @@ public URL getURL(String columnName) throws SQLException {
         return getString(columnIndex);
       case Types.DATE:
         return getDate(columnIndex);
+      case Types.TIME_WITH_TIMEZONE:
       case Types.TIME:
         return getTime(columnIndex);
+      case Types.TIMESTAMP_WITH_TIMEZONE:
       case Types.TIMESTAMP:
         return getTimestamp(columnIndex, null);
       case Types.BINARY:

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

@@ -101,16 +101,26 @@ public class TypeInfoCache implements TypeInfo {
       {"bit", Oid.BIT, Types.BIT, "java.lang.Boolean", Oid.BIT_ARRAY},
       {"date", Oid.DATE, Types.DATE, "java.sql.Date", Oid.DATE_ARRAY},
       {"time", Oid.TIME, Types.TIME, "java.sql.Time", Oid.TIME_ARRAY},
-      {"timetz", Oid.TIMETZ, Types.TIME, "java.sql.Time", Oid.TIMETZ_ARRAY},
       {"timestamp", Oid.TIMESTAMP, Types.TIMESTAMP, "java.sql.Timestamp", Oid.TIMESTAMP_ARRAY},
-      {"timestamptz", Oid.TIMESTAMPTZ, Types.TIMESTAMP, "java.sql.Timestamp",
-          Oid.TIMESTAMPTZ_ARRAY},
       {"refcursor", Oid.REF_CURSOR, Types.REF_CURSOR, "java.sql.ResultSet", Oid.REF_CURSOR_ARRAY},
       {"json", Oid.JSON, Types.OTHER, "org.postgresql.util.PGobject", Oid.JSON_ARRAY},
       {"point", Oid.POINT, Types.OTHER, "org.postgresql.geometric.PGpoint", Oid.POINT_ARRAY},
       {"box", Oid.BOX, Types.OTHER, "org.postgresql.geometric.PGBox", Oid.BOX_ARRAY}
   };
 
+  // whether withTimeZone or noTimeZone types are used is controlled by the PGProperty SQL_TYPES_WITH_TIMEZONE
+  private static final Object[][] sqlTypesWithTimezone = {
+      {"timetz", Oid.TIMETZ, Types.TIME_WITH_TIMEZONE, "java.sql.Time", Oid.TIMETZ_ARRAY},
+      {"timestamptz", Oid.TIMESTAMPTZ, Types.TIMESTAMP_WITH_TIMEZONE, "java.sql.Timestamp",
+          Oid.TIMESTAMPTZ_ARRAY}
+  };
+
+  private static final Object[][] sqlTypesNoTimezone = {
+      {"timetz", Oid.TIMETZ, Types.TIME, "java.sql.Time", Oid.TIMETZ_ARRAY},
+      {"timestamptz", Oid.TIMESTAMPTZ, Types.TIMESTAMP, "java.sql.Timestamp",
+          Oid.TIMESTAMPTZ_ARRAY}
+  };
+
   /**
    * PG maps several alias to real type names. When we do queries against pg_catalog, we must use
    * the real type, not an alias, so use this mapping.
@@ -152,21 +162,23 @@ public class TypeInfoCache implements TypeInfo {
   }
 
   @SuppressWarnings("method.invocation")
-  public TypeInfoCache(BaseConnection conn, int unknownLength) {
+  public TypeInfoCache(BaseConnection conn, int unknownLength,boolean sqlTypeWithTimezone) {
     this.conn = conn;
     this.unknownLength = unknownLength;
-    oidToPgName = new HashMap<>((int) Math.round(types.length * 1.5));
-    pgNameToOid = new HashMap<>((int) Math.round(types.length * 1.5));
-    javaArrayTypeToOid = new HashMap<>((int) Math.round(types.length * 1.5));
-    pgNameToJavaClass = new HashMap<>((int) Math.round(types.length * 1.5));
-    pgNameToPgObject = new HashMap<>((int) Math.round(types.length * 1.5));
-    pgArrayToPgType = new HashMap<>((int) Math.round(types.length * 1.5));
-    arrayOidToDelimiter = new HashMap<>((int) Math.round(types.length * 2.5));
+    final Object[][] timezoneTypes =  sqlTypeWithTimezone ? sqlTypesWithTimezone : sqlTypesNoTimezone;
+    final int typesLength = types.length + timezoneTypes.length;
+    oidToPgName = new HashMap<Integer, String>((int) Math.round(typesLength * 1.5));
+    pgNameToOid = new HashMap<String, Integer>((int) Math.round(typesLength * 1.5));
+    javaArrayTypeToOid = new HashMap<String, Integer>((int) Math.round(typesLength * 1.5));
+    pgNameToJavaClass = new HashMap<String, String>((int) Math.round(typesLength * 1.5));
+    pgNameToPgObject = new HashMap<String, Class<? extends PGobject>>((int) Math.round(typesLength * 1.5));
+    pgArrayToPgType = new HashMap<Integer, Integer>((int) Math.round(typesLength * 1.5));
+    arrayOidToDelimiter = new HashMap<Integer, Character>((int) Math.round(typesLength * 2.5));
 
     // needs to be synchronized because the iterator is returned
     // from getPGTypeNamesWithSQLTypes()
-    pgNameToSQLType = Collections.synchronizedMap(new HashMap<String, Integer>((int) Math.round(types.length * 1.5)));
-    oidToSQLType = Collections.synchronizedMap(new HashMap<Integer, Integer>((int) Math.round(types.length * 1.5)));
+    pgNameToSQLType = Collections.synchronizedMap(new HashMap<String, Integer>((int) Math.round(typesLength * 1.5)));
+    oidToSQLType = Collections.synchronizedMap(new HashMap<Integer, Integer>((int) Math.round(typesLength * 1.5)));
 
     for (Object[] type : types) {
       String pgTypeName = (String) type[0];
@@ -178,6 +190,17 @@ public TypeInfoCache(BaseConnection conn, int unknownLength) {
       addCoreType(pgTypeName, oid, sqlType, javaClass, arrayOid);
     }
 
+    // add timezone types
+    for (Object[] type : timezoneTypes) {
+      String pgTypeName = (String) type[0];
+      Integer oid = (Integer) type[1];
+      Integer sqlType = (Integer) type[2];
+      String javaClass = (String) type[3];
+      Integer arrayOid = (Integer) type[4];
+
+      addCoreType(pgTypeName, oid, sqlType, javaClass, arrayOid);
+    }
+
     pgNameToJavaClass.put("hstore", Map.class.getName());
   }
 

pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java

@@ -262,7 +262,7 @@ public void object3dArrayCopy() throws Exception {
 
   private static final class EncodingConnection implements BaseConnection {
     private final Encoding encoding;
-    private final TypeInfo typeInfo = new TypeInfoCache(this, -1);
+    private final TypeInfo typeInfo = new TypeInfoCache(this, -1,false);
 
     EncodingConnection(Encoding encoding) {
       this.encoding = encoding;