diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java index 016837d18..868ee69f7 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310InstantType.java @@ -35,13 +35,12 @@ public class JSR310InstantType extends AbstractJSR310DateTimeType { @Nullable @Override public Instant getValue(ResultSet rs, int startIndex) throws SQLException { - Date date = rs.getDate(startIndex, utc()); - return date != null ? Instant.from(date.toInstant()) : null; + Timestamp timestamp = rs.getTimestamp(startIndex, utc()); + return timestamp != null ? timestamp.toInstant() : null; } @Override public void setValue(PreparedStatement st, int startIndex, Instant value) throws SQLException { - java.util.Date from = Date.from(value); - st.setDate(startIndex, new Date(from.getTime()), utc()); + st.setTimestamp(startIndex, new Timestamp(value.toEpochMilli()), utc()); } } diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java index 54c28a68e..69cdda676 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310LocalDateTimeType.java @@ -36,13 +36,12 @@ public class JSR310LocalDateTimeType extends AbstractJSR310DateTimeType { @Override public void setValue(PreparedStatement st, int startIndex, LocalTime value) throws SQLException { - st.setTime(startIndex, new Time(value.toNanoOfDay() / 1000000), utc()); + st.setTime(startIndex, Time.valueOf(value), utc()); } } diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java index 73739209e..a4e6c2d3f 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/types/JSR310OffsetDateTimeType.java @@ -2,6 +2,7 @@ package com.querydsl.sql.types; import java.sql.*; import java.time.OffsetDateTime; +import java.time.ZoneOffset; import javax.annotation.Nullable; @@ -36,13 +37,12 @@ public class JSR310OffsetDateTimeType extends AbstractJSR310DateTimeType