From 228a5e708cad53fbe3db03ea5db4f9a1a2568f5b Mon Sep 17 00:00:00 2001
From: Peter Mount <peter@retep.org.uk>
Date: Thu, 1 Jun 2000 06:33:01 +0000
Subject: [PATCH] Removed timezone in ResultSet.getTimestamp()

---
 src/interfaces/jdbc/CHANGELOG                           | 3 +++
 src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java | 2 +-
 src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG
index 2998ab33a2c..8867ce93944 100644
--- a/src/interfaces/jdbc/CHANGELOG
+++ b/src/interfaces/jdbc/CHANGELOG
@@ -1,3 +1,6 @@
+Thu Jun 01 07:26:00 BST 2000 petermount@it.maidstone.gov.uk
+	- Removed timezone in getTimestamp() methods in ResultSet.
+
 Mon May 15 22:30:00 BST 2000 peter@retep.org.uk
 	- Fixed the message Makefile produces after compiling. It still said
 	  about the old Driver class, not the new package. Spotted by
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
index 6bd748e1252..9ca67ad8b45 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
@@ -437,7 +437,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
     if(s==null)
 	return null;
     
-    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
+    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     
     try {
 	return new Timestamp(df.parse(s).getTime());
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
index e3d1693629f..9020e539853 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java
@@ -439,7 +439,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
     if(s==null)
 	return null;
     
-    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
+    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     
     try {
 	return new Timestamp(df.parse(s).getTime());
-- 
GitLab