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

[jOOQ/jOOQ#11485] Trino produces a non-ISO 8601 UTC suffix, instead of Z

Browse Source
This commit is contained in:
Lukas Eder 2023-08-21 13:34:13 +02:00
parent 94dd40961d
commit 37eb9a7702
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,8 +95,8 @@ import java.util.regex.Pattern;
// ...
import org.jooq.Converter;
import org.jooq.ConverterProvider;
import org.jooq.ConverterContext;
import org.jooq.ConverterProvider;
import org.jooq.EnumType;
import org.jooq.Field;
import org.jooq.JSON;
@ -1613,6 +1613,11 @@ final class Convert {
}
static final String patchIso8601Timestamp(String string, boolean t) {
// [#11485] Trino produces a non-ISO 8601 "UTC" suffix, instead of "Z"
if (string.endsWith(" UTC"))
string = string.replace(" UTC", "Z");
if (string.length() > 11)
if (t && string.charAt(10) == ' ')
return string.substring(0, 10) + "T" + string.substring(11);

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

@ -89,12 +89,10 @@ import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
import jakarta.xml.bind.JAXB;
// ...
import org.jooq.Converter;
import org.jooq.ConverterProvider;
import org.jooq.ConverterContext;
import org.jooq.ConverterProvider;
import org.jooq.DataType;
import org.jooq.EnumType;
import org.jooq.Field;
@ -105,13 +103,10 @@ import org.jooq.QualifiedRecord;
import org.jooq.Record;
import org.jooq.Result;
import org.jooq.SQLDialect;
import org.jooq.ContextConverter;
import org.jooq.XML;
import org.jooq.exception.DataTypeException;
import org.jooq.impl.AbstractConverter;
import org.jooq.impl.AbstractContextConverter;
import org.jooq.impl.IdentityConverter;
import org.jooq.impl.Internal;
import org.jooq.tools.jdbc.MockArray;
import org.jooq.tools.jdbc.MockResultSet;
import org.jooq.tools.reflect.Reflect;
@ -125,6 +120,8 @@ import org.jooq.types.YearToSecond;
import org.jooq.util.postgres.PostgresUtils;
import org.jooq.util.xml.jaxb.InformationSchema;
import jakarta.xml.bind.JAXB;
/**
* Utility methods for type conversions
* <p>
@ -1337,6 +1334,11 @@ public final class Convert {
}
private static final String patchIso8601Timestamp(String string, boolean t) {
// [#11485] Trino produces a non-ISO 8601 "UTC" suffix, instead of "Z"
if (string.endsWith(" UTC"))
string = string.replace(" UTC", "Z");
if (string.length() > 11)
if (t && string.charAt(10) == ' ')
return string.substring(0, 10) + "T" + string.substring(11);