From e70b4831d7f5c22d7d68bc7bb5d14a0a3554c3e6 Mon Sep 17 00:00:00 2001 From: Peter Mount Date: Sun, 27 Jun 1999 11:05:38 +0000 Subject: [PATCH] Some minor bug fixes --- src/interfaces/jdbc/CHANGELOG | 6 ++++++ src/interfaces/jdbc/postgresql/Driver.java | 2 +- .../jdbc/postgresql/jdbc1/ResultSet.java | 24 ++++++++-------------- .../jdbc/postgresql/jdbc2/ResultSet.java | 24 ++++++++-------------- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG index 3fc584b00e..830e942b14 100644 --- a/src/interfaces/jdbc/CHANGELOG +++ b/src/interfaces/jdbc/CHANGELOG @@ -1,3 +1,9 @@ +Sun Jun 27 12:00:00 BST 1999 + - Fixed typo in postgresql.Driver that prevented compilation + - Implemented getTimestamp() fix submitted by Philipp Matthias Hahn + + - Cleaned up some comments in Connection + Wed Jun 23 06:50:00 BST 1999 - Fixed error in errors.properties where the arguments are 0 based not 1 based diff --git a/src/interfaces/jdbc/postgresql/Driver.java b/src/interfaces/jdbc/postgresql/Driver.java index 2c78b614ba..06c8903097 100644 --- a/src/interfaces/jdbc/postgresql/Driver.java +++ b/src/interfaces/jdbc/postgresql/Driver.java @@ -104,7 +104,7 @@ public class Driver implements java.sql.Driver return (java.sql.Connection)con; } catch(ClassNotFoundException ex) { throw new PSQLException("postgresql.jvm.version",ex); - } catch(PSQLException(ex1) { + } catch(PSQLException ex1) { // re-throw the exception, otherwise it will be caught next, and a // postgresql.unusual error will be returned instead. throw ex1; diff --git a/src/interfaces/jdbc/postgresql/jdbc1/ResultSet.java b/src/interfaces/jdbc/postgresql/jdbc1/ResultSet.java index fca14e64d9..1ee24a8e29 100644 --- a/src/interfaces/jdbc/postgresql/jdbc1/ResultSet.java +++ b/src/interfaces/jdbc/postgresql/jdbc1/ResultSet.java @@ -434,24 +434,16 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe public Timestamp getTimestamp(int columnIndex) throws SQLException { String s = getString(columnIndex); + if(s==null) + return null; + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz"); - if (s != null) - { - int TZ = new Float(s.substring(19)).intValue(); - TZ = TZ * 60 * 60 * 1000; - TimeZone zone = TimeZone.getDefault(); - zone.setRawOffset(TZ); - String nm = zone.getID(); - s = s.substring(0,19) + nm; - try { - java.util.Date d = df.parse(s); - return new Timestamp(d.getTime()); - } catch (ParseException e) { - throw new PSQLException("postgresql.res.badtimestamp",new Integer(e.getErrorOffset()),s); - } - } - return null; // SQL NULL + try { + return new Timestamp(df.parse(s).getTime()); + } catch(ParseException e) { + throw new PSQLException("postgresql.res.badtimestamp",new Integer(e.getErrorOffset()),s); + } } /** diff --git a/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java b/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java index 0e8b661d23..97fde4a78c 100644 --- a/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java +++ b/src/interfaces/jdbc/postgresql/jdbc2/ResultSet.java @@ -436,24 +436,16 @@ public class ResultSet extends postgresql.ResultSet implements java.sql.ResultSe public Timestamp getTimestamp(int columnIndex) throws SQLException { String s = getString(columnIndex); + if(s==null) + return null; + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz"); - if (s != null) - { - int TZ = new Float(s.substring(19)).intValue(); - TZ = TZ * 60 * 60 * 1000; - TimeZone zone = TimeZone.getDefault(); - zone.setRawOffset(TZ); - String nm = zone.getID(); - s = s.substring(0,19) + nm; - try { - java.util.Date d = df.parse(s); - return new Timestamp(d.getTime()); - } catch (ParseException e) { - throw new PSQLException("postgresql.res.badtimestamp",new Integer(e.getErrorOffset()),s); - } - } - return null; // SQL NULL + try { + return new Timestamp(df.parse(s).getTime()); + } catch(ParseException e) { + throw new PSQLException("postgresql.res.badtimestamp",new Integer(e.getErrorOffset()),s); + } } /** -- 2.11.0