@@ -337,7 +337,8 @@ public void testDateTypes() throws SQLException {
337337 "'2261-12-31 23:59:59.999', '2261-12-31 23:59:59.999999', '2261-12-31 23:59:59.999999999' )" );
338338
339339 // Insert random (valid) values
340- final LocalDateTime now = LocalDateTime .now (ZoneId .of ("America/Los_Angeles" ));
340+ final ZoneId zoneId = ZoneId .of ("America/Los_Angeles" );
341+ final LocalDateTime now = LocalDateTime .now (zoneId );
341342 final Date date = Date .valueOf (now .toLocalDate ());
342343 final Date date32 = Date .valueOf (now .toLocalDate ());
343344 final java .sql .Timestamp dateTime = Timestamp .valueOf (now );
@@ -389,6 +390,12 @@ public void testDateTypes() throws SQLException {
389390 assertTrue (rs .next ());
390391 assertEquals (rs .getDate ("date" ).toString (), date .toString ());
391392 assertEquals (rs .getDate ("date32" ).toString (), date32 .toString ());
393+ assertEquals (rs .getTimestamp ("dateTime" ).toString (), Timestamp .valueOf (dateTime .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
394+ assertEquals (rs .getTimestamp ("dateTime32" ).toString (), Timestamp .valueOf (dateTime32 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
395+ assertEquals (rs .getTimestamp ("dateTime643" ).toString (), Timestamp .valueOf (dateTime643 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
396+ assertEquals (rs .getTimestamp ("dateTime646" ).toString (), Timestamp .valueOf (dateTime646 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
397+ assertEquals (rs .getTimestamp ("dateTime649" ).toString (), Timestamp .valueOf (dateTime649 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
398+
392399 assertEquals (rs .getTimestamp ("dateTime" , new GregorianCalendar (TimeZone .getTimeZone ("UTC" ))).toString (), dateTime .toString ());
393400 assertEquals (rs .getTimestamp ("dateTime32" , new GregorianCalendar (TimeZone .getTimeZone ("UTC" ))).toString (), dateTime32 .toString ());
394401 assertEquals (rs .getTimestamp ("dateTime643" , new GregorianCalendar (TimeZone .getTimeZone ("UTC" ))).toString (), dateTime643 .toString ());
@@ -425,11 +432,12 @@ public void testDateTypes() throws SQLException {
425432 assertTrue (rs .next ());
426433 assertEquals (rs .getObject ("date" ).toString (), date .toString ());
427434 assertEquals (rs .getObject ("date32" ).toString (), date32 .toString ());
428- assertEquals (rs .getObject ("dateTime" ).toString (), dateTime .toString ());
429- assertEquals (rs .getObject ("dateTime32" ).toString (), dateTime32 .toString ());
430- assertEquals (rs .getObject ("dateTime643" ).toString (), dateTime643 .toString ());
431- assertEquals (rs .getObject ("dateTime646" ).toString (), dateTime646 .toString ());
432- assertEquals (rs .getObject ("dateTime649" ).toString (), dateTime649 .toString ());
435+
436+ assertEquals (rs .getObject ("dateTime" ).toString (), Timestamp .valueOf (dateTime .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
437+ assertEquals (rs .getObject ("dateTime32" ).toString (), Timestamp .valueOf (dateTime32 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
438+ assertEquals (rs .getObject ("dateTime643" ).toString (), Timestamp .valueOf (dateTime643 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
439+ assertEquals (rs .getObject ("dateTime646" ).toString (), Timestamp .valueOf (dateTime646 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
440+ assertEquals (rs .getObject ("dateTime649" ).toString (), Timestamp .valueOf (dateTime649 .toInstant ().atZone (ZoneId .of ("UTC" )).toLocalDateTime ()).toString ());
433441
434442 assertFalse (rs .next ());
435443 }
0 commit comments