Merge lp:~massimo-siani/mariadb-java-client/getTimestamp into lp:mariadb-java-client

[Massimo Siani]

JIRA https://mariadb.atlassian.net/browse/CONJ-86

If the timestamp is invalid for the given Timezone, try with UTC timezone.

Unmerged revisions

508. By Massimo Siani on 2014-04-01

If the timestamp to retrieve is invalid for the Timezone, try with UTC

=== modified file 'src/main/java/org/mariadb/jdbc/internal/common/AbstractValueObject.java'
--- src/main/java/org/mariadb/jdbc/internal/common/AbstractValueObject.java	2014-03-25 17:00:46 +0000
+++ src/main/java/org/mariadb/jdbc/internal/common/AbstractValueObject.java	2014-04-01 13:23:50 +0000
@@ -52,6 +52,7 @@
 import org.mariadb.jdbc.MySQLBlob;
 import org.mariadb.jdbc.MySQLClob;
 import org.mariadb.jdbc.internal.mysql.MySQLType;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -61,6 +62,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.TimeZone;
 
 
 public abstract class AbstractValueObject implements ValueObject {
@@ -259,7 +261,13 @@
         if (cal != null) {
             sdf.setCalendar(cal);
         }
-        final java.util.Date utilTime = sdf.parse(rawValue);
+        java.util.Date utilTime = null;
+        try {
+        	utilTime = sdf.parse(rawValue);
+        } catch (ParseException pe) {
+        	sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        	utilTime = sdf.parse(rawValue);
+        }
         Timestamp ts = new Timestamp(utilTime.getTime());
         if(rawValue.indexOf('.') != -1) {
             ts.setNanos(extractNanos(rawValue));
 
=== modified file 'src/test/java/org/mariadb/jdbc/DateTest.java'
--- src/test/java/org/mariadb/jdbc/DateTest.java	2014-03-25 17:00:46 +0000
+++ src/test/java/org/mariadb/jdbc/DateTest.java	2014-04-01 13:23:50 +0000
@@ -47,14 +47,25 @@
         Time time2=rs.getTime(3);
         Time time3=rs.getTime("t_test");
         Timestamp timestamp2=rs.getTimestamp(2);
-        Timestamp timestamp3=rs.getTimestamp("dt_test");
+        Timestamp timestamp3=rs.getTimestamp("dt_test");        
         assertEquals(date.toString(), date2.toString());
         assertEquals(date.toString(), date3.toString());
         assertEquals(time.toString(), time2.toString());
         assertEquals(time.toString(), time3.toString());
         assertEquals(timestamp.toString(), timestamp2.toString());
         assertEquals(timestamp.toString(), timestamp3.toString());
-
+        
+        //stmt.executeUpdate("drop table if exists date_test");
+        //stmt.executeUpdate("update date_test set dt_test = ?");
+        String timestampString = "2014-03-30 02:15:00";
+        timestamp = Timestamp.valueOf(timestampString);
+        ps = connection.prepareStatement("update date_test set dt_test = ?");
+        ps.setString(1, "2014-03-30 02:15:00");
+        ps.executeUpdate();
+        rs = stmt.executeQuery("select dt_test from date_test");
+        assertEquals(true,rs.next());
+        Timestamp timestamp4 = rs.getTimestamp("dt_test");
+        assertEquals(true, timestamp4 != null);
     }
     @Test(expected = SQLException.class)
     public void dateTest2() throws SQLException {
@@ -185,7 +196,6 @@
     @Test
     public void  serverTimezone() throws Exception {
         TimeZone tz = TimeZone.getDefault();
-        TimeZone gmt = TimeZone.getTimeZone("GMT");
         long offset = tz.getRawOffset();
         Connection c = DriverManager.getConnection("jdbc:mysql://localhost/test?user=root&serverTimezone=GMT") ;
         java.util.Date now = new java.util.Date();