Fix to JdbcQuery

raw-labs · Jun 10, 2024 · 9f2ad32 · 9f2ad32
1 parent 6b51b21
commit 9f2ad32
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/JdbcQuery.java b/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/JdbcQuery.java
@@ -18,6 +18,10 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Calendar;
+import java.util.TimeZone;
 import raw.client.api.LocationDescription;
 import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler;
 import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcReaderRawTruffleException;
@@ -36,6 +40,10 @@ public class JdbcQuery {
   private final JdbcExceptionHandler exceptionHandler;
   private final String url;
 
+  // required to extract time and timestamp values
+  private final ZoneId timezone = ZoneId.of("UTC");
+  private final Calendar zonedCalendar = Calendar.getInstance(TimeZone.getTimeZone(timezone));
+
   @TruffleBoundary
   public JdbcQuery(
       LocationDescription locationDescription,
@@ -177,7 +185,8 @@ DateObject getDate(String colName, Node node) {
   TimeObject getTime(String colName, Node node) {
     try {
       java.sql.Time sqlTime = rs.getTime(colName);
-      return new TimeObject(sqlTime.toLocalTime());
+      LocalTime localTime = LocalTime.ofNanoOfDay(sqlTime.getTime() * 1000000);
+      return new TimeObject(localTime);
     } catch (SQLException e) {
       throw exceptionHandler.columnParseError(e, colName, node);
     }
@@ -186,7 +195,7 @@ TimeObject getTime(String colName, Node node) {
   @TruffleBoundary
   TimestampObject getTimestamp(String colName, Node node) {
     try {
-      java.sql.Timestamp sqlTimestamp = rs.getTimestamp(colName);
+      java.sql.Timestamp sqlTimestamp = rs.getTimestamp(colName, zonedCalendar);
       return new TimestampObject(sqlTimestamp.toLocalDateTime());
     } catch (SQLException e) {
       throw exceptionHandler.columnParseError(e, colName, node);