Removed timezone in ResultSet.getTimestamp()

diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG
index 2998ab33a2c4bdfd9ab7c0202ab3a5b16935ab1f..8867ce939444c9a8bef24dc5f4da7832375f6d57 100644 (file)
--- 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 6bd748e12528ca4d270be13c5ebfbeed8f23e17d..9ca67ad8b451078402240dc2452c352f890a99cf 100644 (file)
--- 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 e3d1693629fdeccc96290343c683f84e801b55c6..9020e539853ae2b5dfd991dff8c500eea8536d23 100644 (file)
--- 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());