From: Barry Lind <barry@xythos.com>
Date: Tue, 15 Jan 2002 06:55:13 +0000 (+0000)
Subject: Applied patch from Ryouichi Matsuda <r-matuda@sra.co.jp> where the jdbc
X-Git-Tag: REL7_2_RC1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d013dbed75273d83785af62f0c0506930820618e;p=thirdparty%2Fpostgresql.git

Applied patch from Ryouichi Matsuda <r-matuda@sra.co.jp> 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 4507a272852..4d3e087f76b 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/Connection.java
@@ -17,7 +17,7 @@ import org.postgresql.largeobject.*;
 import org.postgresql.util.*;
 
 /*
- * $Id: Connection.java,v 1.14 2001/11/25 23:26:58 barry Exp $
+ * $Id: Connection.java,v 1.15 2002/01/15 06:55:13 barry Exp $
  *
  * A Connection represents a session with a specific database.	Within the
  * context of a Connection, SQL statements are executed and results are
@@ -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 355c240fab0..e3ff6393940 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/Connection.java
@@ -17,7 +17,7 @@ import org.postgresql.largeobject.*;
 import org.postgresql.util.*;
 
 /*
- * $Id: Connection.java,v 1.16 2001/11/25 23:26:59 barry Exp $
+ * $Id: Connection.java,v 1.17 2002/01/15 06:55:13 barry Exp $
  *
  * A Connection represents a session with a specific database.	Within the
  * context of a Connection, SQL statements are executed and results are
@@ -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,