@@ -463,8 +463,13 @@ public Date getDate(int columnIndex, Calendar cal) throws SQLException {
463
463
if (instant == null ) {
464
464
return null ;
465
465
}
466
- final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
467
- return Date .valueOf (instant .atZone (tz .toZoneId ()).toLocalDate ());
466
+
467
+ if (state .description .isTimestamp ()) {
468
+ final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
469
+ return Date .valueOf (instant .atZone (tz .toZoneId ()).toLocalDate ());
470
+ }
471
+
472
+ return Date .valueOf (instant .atOffset (ZoneOffset .UTC ).toLocalDate ());
468
473
}
469
474
470
475
@ Override
@@ -478,8 +483,13 @@ public Time getTime(int columnIndex, Calendar cal) throws SQLException {
478
483
if (instant == null ) {
479
484
return null ;
480
485
}
481
- final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
482
- return Time .valueOf (instant .atZone (tz .toZoneId ()).toLocalTime ());
486
+
487
+ if (state .description .isTimestamp ()) {
488
+ final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
489
+ return Time .valueOf (instant .atZone (tz .toZoneId ()).toLocalTime ());
490
+ }
491
+
492
+ return Time .valueOf (instant .atOffset (ZoneOffset .UTC ).toLocalTime ());
483
493
}
484
494
485
495
@ Override
@@ -493,8 +503,13 @@ public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException
493
503
if (instant == null ) {
494
504
return null ;
495
505
}
496
- final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
497
- return Timestamp .valueOf (instant .atZone (tz .toZoneId ()).toLocalDateTime ());
506
+
507
+ if (state .description .isTimestamp ()) {
508
+ final TimeZone tz = cal != null ? cal .getTimeZone () : Calendar .getInstance ().getTimeZone ();
509
+ return Timestamp .valueOf (instant .atZone (tz .toZoneId ()).toLocalDateTime ());
510
+ }
511
+
512
+ return Timestamp .valueOf (instant .atOffset (ZoneOffset .UTC ).toLocalDateTime ());
498
513
}
499
514
500
515
@ Override
0 commit comments