Applied patch from Ryouichi Matsuda <[email protected]> where the jdbc

driver was not properly handling timestamptz datatype when using the
getObject() method on ResultSet.  Fix adds this datatype to the object mappings.

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
index 3d0a7c9f54e0d36b9308560fd05e8c80249527c3..e84888a74419b0d37037aaa6d0c28a8e00d9becb 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
@@ -180,7 +180,7 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
                                "bool",
                                "date",
                                "time",
-                               "abstime", "timestamp"
+                               "abstime", "timestamp", "timestamptz"
                        };
 
        /*
@@ -204,7 +204,7 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
                                                                                                Types.BIT,
                                                                                                Types.DATE,
                                                                                                Types.TIME,
-                                                                                               Types.TIMESTAMP, Types.TIMESTAMP
+                                                                                               Types.TIMESTAMP, Types.TIMESTAMP, Types.TIMESTAMP
                                                                                        };
 
 

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
index 9ae76fd618e10135f4b3ca1e13a9ed8dccea75ab..8189444b2c9d337b5b6663a04bd0d9de10371242 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
@@ -303,7 +303,7 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
                                "bool",
                                "date",
                                "time",
-                               "abstime", "timestamp",
+                               "abstime", "timestamp", "timestamptz",
                                "_bool", "_char", "_int2", "_int4", "_text",
                                "_oid", "_varchar", "_int8", "_float4", "_float8",
                                "_abstime", "_date", "_time", "_timestamp", "_numeric",
@@ -331,7 +331,7 @@ public class Connection extends org.postgresql.Connection implements java.sql.Co
                                                                                                Types.BIT,
                                                                                                Types.DATE,
                                                                                                Types.TIME,
-                                                                                               Types.TIMESTAMP, Types.TIMESTAMP,
+                                                                                               Types.TIMESTAMP, Types.TIMESTAMP, Types.TIMESTAMP,
                                                                                                Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY,
                                                                                                Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY,
                                                                                                Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY, Types.ARRAY,