Added base Calendar implementation

alex268 · Jul 30, 2024 · 0028cdb · 0028cdb
1 parent 914b648
commit 0028cdb
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbResultSetImpl.java b/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbResultSetImpl.java
@@ -463,8 +463,13 @@ public Date getDate(int columnIndex, Calendar cal) throws SQLException {
         if (instant == null) {
             return null;
         }
-        final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
-        return Date.valueOf(instant.atZone(tz.toZoneId()).toLocalDate());
+
+        if (state.description.isTimestamp()) {
+            final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
+            return Date.valueOf(instant.atZone(tz.toZoneId()).toLocalDate());
+        }
+
+        return Date.valueOf(instant.atOffset(ZoneOffset.UTC).toLocalDate());
     }
 
     @Override
@@ -478,8 +483,13 @@ public Time getTime(int columnIndex, Calendar cal) throws SQLException {
         if (instant == null) {
             return null;
         }
-        final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
-        return Time.valueOf(instant.atZone(tz.toZoneId()).toLocalTime());
+
+        if (state.description.isTimestamp()) {
+            final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
+            return Time.valueOf(instant.atZone(tz.toZoneId()).toLocalTime());
+        }
+
+        return Time.valueOf(instant.atOffset(ZoneOffset.UTC).toLocalTime());
     }
 
     @Override
@@ -493,8 +503,13 @@ public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException
         if (instant == null) {
             return null;
         }
-        final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
-        return Timestamp.valueOf(instant.atZone(tz.toZoneId()).toLocalDateTime());
+
+        if (state.description.isTimestamp()) {
+            final TimeZone tz = cal != null ? cal.getTimeZone() : Calendar.getInstance().getTimeZone();
+            return Timestamp.valueOf(instant.atZone(tz.toZoneId()).toLocalDateTime());
+        }
+
+        return Timestamp.valueOf(instant.atOffset(ZoneOffset.UTC).toLocalDateTime());
     }
 
     @Override