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

[Massimo Siani]

Fix for CONJ-94

CONJ-94:
SQL DATEs stored wrong if client timezone is east of server timezone.

The proposed solution is to discard any calendar when calling PreparedStatement.setDate.

Unmerged revisions

517. By Massimo Siani on 2014-07-11

Fix for CONJ-94

=== modified file 'src/main/java/org/mariadb/jdbc/MySQLPreparedStatement.java'
--- src/main/java/org/mariadb/jdbc/MySQLPreparedStatement.java	2013-11-13 08:16:46 +0000
+++ src/main/java/org/mariadb/jdbc/MySQLPreparedStatement.java	2014-07-11 10:00:56 +0000
@@ -388,7 +388,7 @@
             setNull(parameterIndex, Types.DATE);
             return;
         }
-        setParameter(parameterIndex, new DateParameter(date, cal));
+        setParameter(parameterIndex, new DateParameter(date, null));
     }
 
     /**

=== modified file 'src/test/java/org/mariadb/jdbc/DateTest.java'
--- src/test/java/org/mariadb/jdbc/DateTest.java	2014-06-18 15:16:23 +0000
+++ src/test/java/org/mariadb/jdbc/DateTest.java	2014-07-11 10:00:56 +0000
@@ -239,6 +239,25 @@
         ts  =  rs.getTimestamp(1);
         java.sql.Timestamp ts2 =  rs.getTimestamp(2);
         assertTrue(Math.abs(ts.getTime() - ts2.getTime()) < 1000); /* query take less than a second */
-
     }
+    
+	/**
+	 * CONJ-94
+	 * @throws SQLException
+	 */
+	@Test
+	public void serverWestTest() throws SQLException {
+		Connection c = DriverManager.getConnection("jdbc:mysql://localhost/test?user=root&serverTimezone=America/Los_Angeles");
+		Statement stmt = c.createStatement();
+		stmt.execute("DROP TABLE IF EXISTS date_test");
+		stmt.execute("CREATE TABLE date_test ( x date )");
+		PreparedStatement pst = c.prepareStatement("INSERT INTO date_test VALUES (?)");
+		Date date = Date.valueOf("2013-11-20");
+		pst.setDate(1, date);
+		pst.execute();
+		ResultSet rs = stmt.executeQuery("SELECT x FROM date_test");
+		rs.next();
+		// the objects won't be equal
+		assertEquals(date.toString(), rs.getDate(1).toString());
+	}
 }