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

[jOOQ/jOOQ#12130] Wrong deserialisation of temporal data types in

Browse Source 
MULTISET
This commit is contained in:
Lukas Eder 2021-07-08 15:21:06 +02:00
parent 0138667a71
commit bcd0746a24
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -928,7 +928,7 @@ final class Convert {
// [#1501] Strings can be converted to java.sql.Date
else if (fromClass == String.class && toClass == java.sql.Timestamp.class) {
try {
return (U) java.sql.Timestamp.valueOf((String) from);
return (U) java.sql.Timestamp.valueOf(patchIso8601((String) from, false));
}
catch (IllegalArgumentException e) {
return null;
@ -983,18 +983,11 @@ final class Convert {
}
else if (fromClass == String.class && toClass == LocalDateTime.class) {
// Try "lenient" ISO date formats first
try {
return (U) java.sql.Timestamp.valueOf((String) from).toLocalDateTime();
return (U) LocalDateTime.parse(patchIso8601((String) from, true));
}
catch (IllegalArgumentException e1) {
try {
return (U) LocalDateTime.parse((String) from);
}
catch (DateTimeParseException e2) {
return null;
}
catch (DateTimeParseException e2) {
return null;
}
}
@ -1213,6 +1206,15 @@ final class Convert {
throw fail(from, toClass);
}
private static final String patchIso8601(String string, boolean t) {
if (t && string.charAt(10) == ' ')
return string.substring(0, 10) + "T" + string.substring(11);
else if (!t && string.charAt(10) == 'T')
return string.substring(0, 10) + " " + string.substring(11);
else
return string;
}
@Override
public Object to(U to) {
return to;

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

@ -920,7 +920,7 @@ public final class Convert {
// [#1501] Strings can be converted to java.sql.Date
else if (fromClass == String.class && toClass == java.sql.Timestamp.class) {
try {
return (U) java.sql.Timestamp.valueOf((String) from);
return (U) java.sql.Timestamp.valueOf(patchIso8601((String) from, false));
}
catch (IllegalArgumentException e) {
return null;
@ -975,18 +975,11 @@ public final class Convert {
}
else if (fromClass == String.class && toClass == LocalDateTime.class) {
// Try "lenient" ISO date formats first
try {
return (U) java.sql.Timestamp.valueOf((String) from).toLocalDateTime();
return (U) LocalDateTime.parse(patchIso8601((String) from, true));
}
catch (IllegalArgumentException e1) {
try {
return (U) LocalDateTime.parse((String) from);
}
catch (DateTimeParseException e2) {
return null;
}
catch (DateTimeParseException e2) {
return null;
}
}
@ -1205,6 +1198,15 @@ public final class Convert {
throw fail(from, toClass);
}
private static final String patchIso8601(String string, boolean t) {
if (t && string.charAt(10) == ' ')
return string.substring(0, 10) + "T" + string.substring(11);
else if (!t && string.charAt(10) == 'T')
return string.substring(0, 10) + " " + string.substring(11);
else
return string;
}
@Override
public Object to(U to) {
return to;