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

[Massimo Siani]

Fix for CONJ-86

CONJ-86:
It seems that the getTimestamp of the ResultSet class use the default client timestamp for time conversions. This works in most cases, but when Daylight Saving Time is used, it fails at certain times.

Proposed solution: if an exception is thrown while parsing the timestamp, and no explicit calendar has been set, try with UTC. Otherwise, works as before (throws the exception).

[lp:~massimo-siani/mariadb-java-client/CONJ-86]

513. By Massimo Siani on 2014-07-07

Merge changes from trunk and retest

Unmerged revisions

513. By Massimo Siani on 2014-07-07

Merge changes from trunk and retest

512. By Massimo Siani on 2014-06-24

If a calendar has been given, do not try with UTC

511. By Massimo Siani on 2014-06-24

Fix for CONJ-86

=== 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-07-07 10:12:18 +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,17 @@
         if (cal != null) {
             sdf.setCalendar(cal);
         }
-        final java.util.Date utilTime = sdf.parse(rawValue);
+        java.util.Date utilTime;
+        try {
+        	utilTime = sdf.parse(rawValue);
+        } catch (ParseException pe) {
+        	if (cal == null) {
+        		sdf.setCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+        		utilTime = sdf.parse(rawValue);
+        	} else {
+        		throw pe;
+        	}
+        }
         Timestamp ts = new Timestamp(utilTime.getTime());
         if(rawValue.indexOf('.') != -1) {
             ts.setNanos(extractNanos(rawValue));
 
=== added file 'src/test/java/org/mariadb/jdbc/TimestampTest.java'
--- src/test/java/org/mariadb/jdbc/TimestampTest.java	1970-01-01 00:00:00 +0000
+++ src/test/java/org/mariadb/jdbc/TimestampTest.java	2014-07-07 10:12:18 +0000
@@ -0,0 +1,93 @@
+package org.mariadb.jdbc;
+
+import static org.junit.Assert.*;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TimestampTest extends BaseTest {
+
+    private Statement stmt;
+    private Locale previousFormatLocale;
+    private TimeZone previousTimeZone;
+    private TimeZone swedishTimeZone;
+    private String prevTimeZone;
+
+    @Before
+    public void setUp() throws SQLException {
+        //Save the previous FORMAT locate so we can restore it later
+        previousFormatLocale = Locale.getDefault(Locale.Category.FORMAT);
+        //Save the previous timezone so we can restore it later
+        previousTimeZone = TimeZone.getDefault();
+        
+        swedishTimeZone = TimeZone.getTimeZone("Europe/Stockholm");
+        TimeZone.setDefault(swedishTimeZone); //Everybody running this test case should be in Sweden
+        
+        stmt = connection.createStatement();
+        
+        ResultSet rs = stmt.executeQuery("SELECT @@time_zone");
+        rs.next();
+        prevTimeZone = rs.getString(1);
+        rs.close();
+        stmt.execute("SET time_zone = '+00:00'");
+        stmt.execute("drop table if exists timestamptest");
+        stmt.execute("create table timestamptest (id int not null primary key auto_increment, tm timestamp)");
+    }
+    
+    @After
+    public void tearDown() throws SQLException {
+        //Reset the FORMAT locate so other test cases are not disturbed.
+        Locale.setDefault(Locale.Category.FORMAT, previousFormatLocale);
+        //Reset the timezone so so other test cases are not disturbed.
+        TimeZone.setDefault(previousTimeZone);
+        stmt.execute("SET time_zone = '" + prevTimeZone + "'");
+    }
+    
+    
+    @Test
+    public void testGetTimestamp() throws SQLException {
+        Calendar _20140101_1320_59 = Calendar.getInstance(TimeZone.getTimeZone("utc"));
+        _20140101_1320_59.clear();
+        _20140101_1320_59.set(2014, 0, 1, 13, 20, 59);
+        
+        PreparedStatement ps = connection.prepareStatement("insert into timestamptest values(1, ?)");
+        ps.setTimestamp(1, new Timestamp(_20140101_1320_59.getTimeInMillis()));
+        ps.execute();
+        
+        ResultSet rs = stmt.executeQuery("select * from timestamptest");
+        while(rs.next()) {
+            Timestamp timestamp = rs.getTimestamp(2);
+            assertEquals(_20140101_1320_59.getTimeInMillis(), timestamp.getTime());
+        }
+    }
+    
+    @Test
+    public void testGetTimestampWhenDaylightSavingRemovesHour() throws SQLException {
+        //The time 2014-03-30 01:15:00 is valid in UTC
+        Calendar quaterPastTwo30thOfMarth2014 = Calendar.getInstance(TimeZone.getTimeZone("utc"));
+        quaterPastTwo30thOfMarth2014.clear();
+        quaterPastTwo30thOfMarth2014.set(2014, 2, 30, 2, 15, 0);
+        
+        PreparedStatement ps = connection.prepareStatement("insert into timestamptest values(1, ?)");
+        //Explicitly set a time that does not exists in Swedish timezone
+        //Note: this query will only work if the server is set to UTC (set time_zone = '+00:00' above)
+        ps.setString(1, "2014-03-30 02:15:00");
+        ps.execute();
+        
+        ResultSet rs = stmt.executeQuery("select * from timestamptest");
+        while(rs.next()) {
+            Timestamp timestamp = rs.getTimestamp(2);
+            assertEquals(quaterPastTwo30thOfMarth2014.getTimeInMillis(), timestamp.getTime());
+        }
+    }
+}