1 files changed, 40 insertions, 16 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
index 3010ed59a3..8bdb67cb28 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
@@ -462,25 +462,49 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
     String s = getString(columnIndex);
     if(s==null)
 	return null;
-    
-    // This works, but it's commented out because Michael Stephenson's
-    // solution is better still:
-    //SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    
-    // Michael Stephenson's solution:
+
+    boolean subsecond;
+    //if string contains a '.' we have fractional seconds
+    if (s.indexOf('.') == -1) {
+      subsecond = false;
+    } else {
+      subsecond = true;
+    }
+
+    //here we are modifying the string from ISO format to a format java can understand
+    //java expects timezone info as 'GMT-08:00' instead of '-08' in postgres ISO format
+    //and java expects three digits if fractional seconds are present instead of two for postgres
+    //so this code strips off timezone info and adds on the GMT+/-...
+    //as well as adds a third digit for partial seconds if necessary
+    StringBuffer strBuf = new StringBuffer(s);
+    char sub = strBuf.charAt(strBuf.length()-3);
+    if (sub == '+' || sub == '-') {
+      strBuf.setLength(strBuf.length()-3);
+      if (subsecond)  {
+        strBuf = strBuf.append('0').append("GMT").append(s.substring(s.length()-3, s.length())).append(":00");
+      } else {
+        strBuf = strBuf.append("GMT").append(s.substring(s.length()-3, s.length())).append(":00");
+      }
+    } else if (subsecond) {
+      strBuf = strBuf.append('0');
+    }
+
+    s = strBuf.toString();
+
     SimpleDateFormat df = null;
-    if (s.length()>21 && s.indexOf('.') != -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSzzz");
-    } else if (s.length()>19 && s.indexOf('.') == -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:sszzz");
-    } else if (s.length()>19 && s.indexOf('.') != -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:ss.SS");
-    } else if (s.length()>10 && s.length()<=18) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
+
+    if (s.length()>23 && subsecond) {
+      df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSzzzzzzzzz");
+    } else if (s.length()>23 && !subsecond) {
+      df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzzzzzzzz");
+    } else if (s.length()>10 && subsecond) {
+      df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+    } else if (s.length()>10 && !subsecond) {
+      df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     } else {
-	df = new SimpleDateFormat("yyyy-MM-dd");
+      df = new SimpleDateFormat("yyyy-MM-dd");
     }
-    
+
     try {
 	return new Timestamp(df.parse(s).getTime());
     } catch(ParseException e) {