github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#13913] Convert truncates microseconds from OffsetDateTime

Browse Source 
when converting to Instant
This commit is contained in:
Lukas Eder 2022-08-25 13:21:19 +02:00
parent dd7f0b0ad8
commit ea55baf863
2 changed files with 72 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
jOOQ/src/main/java/org/jooq/impl/Convert.java
View File

@ -944,8 +944,11 @@ final class Convert {
else if (java.util.Date.class.isAssignableFrom(fromClass)) {
// [#12225] Avoid losing precision if possible
if (Timestamp.class == fromClass && LocalDateTime.class == toClass)
return (U) ((Timestamp) from).toLocalDateTime();
if (Timestamp.class == fromClass)
if (LocalDateTime.class == toClass)
return (U) ((Timestamp) from).toLocalDateTime();
else
return toDate(((Timestamp) from).getTime(), ((Timestamp) from).getNanos(), toClass);
else if (Date.class == fromClass && LocalDate.class == toClass)
return (U) ((Date) from).toLocalDate();
else if (Time.class == fromClass && LocalTime.class == toClass)
@ -958,10 +961,14 @@ final class Convert {
// [#12225] Avoid losing precision if possible
if (LocalDateTime.class == fromClass && Timestamp.class == toClass)
return (U) Timestamp.valueOf((LocalDateTime) from);
else if (LocalDateTime.class == fromClass && Temporal.class.isAssignableFrom(toClass))
return toDate(((LocalDateTime) from).toInstant(OffsetTime.now().getOffset()).toEpochMilli(), ((LocalDateTime) from).getNano(), toClass);
else if (LocalDate.class == fromClass && Date.class == toClass)
return (U) Date.valueOf((LocalDate) from);
else if (LocalTime.class == fromClass && Time.class == toClass)
return (U) Time.valueOf((LocalTime) from);
else if (OffsetDateTime.class == fromClass && (Timestamp.class == toClass || Temporal.class.isAssignableFrom(toClass)))
return toDate(((OffsetDateTime) from).toInstant().toEpochMilli(), ((OffsetDateTime) from).getNano(), toClass);
else
return toDate(convert(from, Long.class), toClass);
}
@ -1405,16 +1412,24 @@ final class Convert {
}
/**
* Convert a long timestamp to any date type
* Convert a long timestamp (millis) to any date type.
*/
private static <X> X toDate(long time, Class<X> toClass) {
return toDate(time, 0, toClass);
}
/**
* Convert a long timestamp (millis) with nanos adjustment to any date
* type.
*/
@SuppressWarnings("unchecked")
private static <X> X toDate(long time, Class<X> toClass) {
private static <X> X toDate(long time, int nanos, Class<X> toClass) {
if (toClass == Date.class)
return (X) new Date(time);
else if (toClass == Time.class)
return (X) new Time(time);
else if (toClass == Timestamp.class)
return (X) new Timestamp(time);
return (X) toTimestamp(time, nanos);
else if (toClass == java.util.Date.class)
return (X) new java.util.Date(time);
else if (toClass == Calendar.class) {
@ -1429,15 +1444,27 @@ final class Convert {
else if (toClass == OffsetTime.class)
return (X) new Time(time).toLocalTime().atOffset(OffsetTime.now().getOffset());
else if (toClass == LocalDateTime.class)
return (X) new Timestamp(time).toLocalDateTime();
return (X) toTimestamp(time, nanos).toLocalDateTime();
else if (toClass == OffsetDateTime.class)
return (X) new Timestamp(time).toLocalDateTime().atOffset(OffsetDateTime.now().getOffset());
return (X) toTimestamp(time, nanos).toLocalDateTime().atOffset(OffsetDateTime.now().getOffset());
else if (toClass == Instant.class)
return (X) Instant.ofEpochMilli(time);
if (nanos == 0L)
return (X) Instant.ofEpochMilli(time);
else
return (X) Instant.ofEpochSecond(time / 1000L, nanos);
throw fail(time, toClass);
}
private static Timestamp toTimestamp(long time, int nanos) {
if (nanos == 0L)
return new Timestamp(time);
Timestamp ts = new Timestamp(time / 1000L * 1000L);
ts.setNanos(nanos);
return ts;
}
private static final long millis(Temporal temporal) {
// java.sql.* temporal types:

49
jOOQ/src/main/java/org/jooq/tools/Convert.java
View File

@ -880,13 +880,15 @@ public final class Convert {
return null;
}
}
// Date types can be converted among each other
else if (java.util.Date.class.isAssignableFrom(fromClass)) {
// [#12225] Avoid losing precision if possible
if (Timestamp.class == fromClass && LocalDateTime.class == toClass)
return (U) ((Timestamp) from).toLocalDateTime();
if (Timestamp.class == fromClass)
if (LocalDateTime.class == toClass)
return (U) ((Timestamp) from).toLocalDateTime();
else
return toDate(((Timestamp) from).getTime(), ((Timestamp) from).getNanos(), toClass);
else if (Date.class == fromClass && LocalDate.class == toClass)
return (U) ((Date) from).toLocalDate();
else if (Time.class == fromClass && LocalTime.class == toClass)
@ -899,16 +901,17 @@ public final class Convert {
// [#12225] Avoid losing precision if possible
if (LocalDateTime.class == fromClass && Timestamp.class == toClass)
return (U) Timestamp.valueOf((LocalDateTime) from);
else if (LocalDateTime.class == fromClass && Temporal.class.isAssignableFrom(toClass))
return toDate(((LocalDateTime) from).toInstant(OffsetTime.now().getOffset()).toEpochMilli(), ((LocalDateTime) from).getNano(), toClass);
else if (LocalDate.class == fromClass && Date.class == toClass)
return (U) Date.valueOf((LocalDate) from);
else if (LocalTime.class == fromClass && Time.class == toClass)
return (U) Time.valueOf((LocalTime) from);
else if (OffsetDateTime.class == fromClass && (Timestamp.class == toClass || Temporal.class.isAssignableFrom(toClass)))
return toDate(((OffsetDateTime) from).toInstant().toEpochMilli(), ((OffsetDateTime) from).getNano(), toClass);
else
return toDate(convert(from, Long.class), toClass);
}
else if (Temporal.class.isAssignableFrom(fromClass)) {
return toDate(convert(from, Long.class), toClass);
}
// Long may also be converted into a date type
else if (wrapperFrom == Long.class && java.util.Date.class.isAssignableFrom(toClass)) {
@ -1251,17 +1254,26 @@ public final class Convert {
return (Class<U>) toClass;
}
/**
* Convert a long timestamp to any date type
* Convert a long timestamp (millis) to any date type.
*/
private static <X> X toDate(long time, Class<X> toClass) {
return toDate(time, 0, toClass);
}
/**
* Convert a long timestamp (millis) with nanos adjustment to any date
* type.
*/
@SuppressWarnings("unchecked")
private static <X> X toDate(long time, Class<X> toClass) {
private static <X> X toDate(long time, int nanos, Class<X> toClass) {
if (toClass == Date.class)
return (X) new Date(time);
else if (toClass == Time.class)
return (X) new Time(time);
else if (toClass == Timestamp.class)
return (X) new Timestamp(time);
return (X) toTimestamp(time, nanos);
else if (toClass == java.util.Date.class)
return (X) new java.util.Date(time);
else if (toClass == Calendar.class) {
@ -1276,15 +1288,28 @@ public final class Convert {
else if (toClass == OffsetTime.class)
return (X) new Time(time).toLocalTime().atOffset(OffsetTime.now().getOffset());
else if (toClass == LocalDateTime.class)
return (X) new Timestamp(time).toLocalDateTime();
return (X) toTimestamp(time, nanos).toLocalDateTime();
else if (toClass == OffsetDateTime.class)
return (X) new Timestamp(time).toLocalDateTime().atOffset(OffsetDateTime.now().getOffset());
return (X) toTimestamp(time, nanos).toLocalDateTime().atOffset(OffsetDateTime.now().getOffset());
else if (toClass == Instant.class)
return (X) Instant.ofEpochMilli(time);
if (nanos == 0L)
return (X) Instant.ofEpochMilli(time);
else
return (X) Instant.ofEpochSecond(time / 1000L, nanos);
throw fail(time, toClass);
}
private static Timestamp toTimestamp(long time, int nanos) {
if (nanos == 0L)
return new Timestamp(time);
Timestamp ts = new Timestamp(time / 1000L * 1000L);
ts.setNanos(nanos);
return ts;
}
private static final long millis(Temporal temporal) {
// java.sql.* temporal types: