Tweaking date handling

Author: Paultagoras

jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java

@@ -269,7 +269,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
     public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
         checkClosed();
         if (cal == null) {
-            cal = new GregorianCalendar();//This says whatever date is in UTC
+            cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));//This says whatever date is in UTC
         }
 
         LocalDate d = x.toLocalDate();

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

@@ -1053,7 +1053,7 @@ public Date getDate(String columnLabel, Calendar cal) throws SQLException {
             wasNull = false;
 
             if (cal == null) {
-                cal = new GregorianCalendar();
+                cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));//Default to UTC
             }
 
             return Date.valueOf(zdt.withZoneSameInstant(cal.getTimeZone().toZoneId()).toLocalDate());

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -281,26 +281,26 @@ public void testDateTypes() throws SQLException {
             try (Statement stmt = conn.createStatement()) {
                 try (ResultSet rs = stmt.executeQuery("SELECT * FROM test_dates ORDER BY order")) {
                     assertTrue(rs.next());
-                    assertEquals(rs.getDate("date", new GregorianCalendar(TimeZone.getTimeZone("UTC"))), Date.valueOf("1970-01-01"));
-                    assertEquals(rs.getDate("date32", new GregorianCalendar(TimeZone.getTimeZone("UTC"))), Date.valueOf("1970-01-01"));
+                    assertEquals(rs.getDate("date"), Date.valueOf("1970-01-01"));
+                    assertEquals(rs.getDate("date32"), Date.valueOf("1970-01-01"));
                     assertEquals(rs.getTimestamp("dateTime").toInstant().toString(), "1970-01-01T00:00:00Z");
                     assertEquals(rs.getTimestamp("dateTime32").toInstant().toString(), "1970-01-01T00:00:00Z");
                     assertEquals(rs.getTimestamp("dateTime643").toInstant().toString(), "1970-01-01T00:00:00Z");
                     assertEquals(rs.getTimestamp("dateTime646").toInstant().toString(), "1970-01-01T00:00:00Z");
                     assertEquals(rs.getTimestamp("dateTime649").toInstant().toString(), "1970-01-01T00:00:00Z");
 
                     assertTrue(rs.next());
-                    assertEquals(rs.getDate("date", new GregorianCalendar(TimeZone.getTimeZone("UTC"))), Date.valueOf("2149-06-06"));
-                    assertEquals(rs.getDate("date32", new GregorianCalendar(TimeZone.getTimeZone("UTC"))), Date.valueOf("2299-12-31"));
+                    assertEquals(rs.getDate("date"), Date.valueOf("2149-06-06"));
+                    assertEquals(rs.getDate("date32"), Date.valueOf("2299-12-31"));
                     assertEquals(rs.getTimestamp("dateTime").toInstant().toString(), "2106-02-07T06:28:15Z");
                     assertEquals(rs.getTimestamp("dateTime32").toInstant().toString(), "2106-02-07T06:28:15Z");
                     assertEquals(rs.getTimestamp("dateTime643").toInstant().toString(), "2261-12-31T23:59:59.999Z");
                     assertEquals(rs.getTimestamp("dateTime646").toInstant().toString(), "2261-12-31T23:59:59.999999Z");
                     assertEquals(rs.getTimestamp("dateTime649").toInstant().toString(), "2261-12-31T23:59:59.999999999Z");
 
                     assertTrue(rs.next());
-                    assertEquals(rs.getDate("date", new GregorianCalendar(TimeZone.getTimeZone("UTC"))).toString(), date.toString());
-                    assertEquals(rs.getDate("date32", new GregorianCalendar(TimeZone.getTimeZone("UTC"))).toString(), date32.toString());
+                    assertEquals(rs.getDate("date").toString(), date.toString());
+                    assertEquals(rs.getDate("date32").toString(), date32.toString());
                     assertEquals(rs.getTimestamp("dateTime").toString(), dateTime.toString());
                     assertEquals(rs.getTimestamp("dateTime32").toString(), dateTime32.toString());
                     assertEquals(rs.getTimestamp("dateTime643").toString(), dateTime643.toString());