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

[#4187] SQLite timestamps with trailing fractional zeros are misinterpreted

Browse Source
This commit is contained in:
lukaseder 2015-04-10 10:35:45 +02:00
parent b5ce649b16
commit 9090939e54
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
View File

@ -1793,7 +1793,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
String date = rs.getString(index);
if (date != null) {
return new Date(parse("yyyy-MM-dd", date));
return new Date(parse(Date.class, date));
}
return null;
@ -1827,7 +1827,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
String time = rs.getString(index);
if (time != null) {
return new Time(parse("HH:mm:ss", time));
return new Time(parse(Time.class, time));
}
return null;
@ -1861,7 +1861,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
String timestamp = rs.getString(index);
if (timestamp != null) {
return new Timestamp(parse("yyyy-MM-dd HH:mm:ss.SSS", timestamp));
return new Timestamp(parse(Timestamp.class, timestamp));
}
return null;
@ -1870,26 +1870,26 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
}
}
private static final long parse(String pattern, String date) throws SQLException {
private static final long parse(Class<? extends java.util.Date> type, String date) throws SQLException {
// Try reading a plain number first
try {
// Try reading a plain number first
try {
return Long.valueOf(date);
}
// If that fails, try reading a formatted date
catch (NumberFormatException e) {
// [#4134] Fractional seconds may be optional depending on the
// JDBC driver implementation, specifically Xerial for SQLite
if (pattern.contains(".") && !date.contains("."))
return new SimpleDateFormat(pattern).parse(date + ".0").getTime();
else
return new SimpleDateFormat(pattern).parse(date).getTime();
}
return Long.valueOf(date);
}
catch (ParseException e) {
// If that fails, try reading a formatted date
catch (NumberFormatException e) {
if (type == Timestamp.class)
return Timestamp.valueOf(date).getTime();
// Dates may come with " 00:00:00". This is safely trimming time information
if (type == Date.class)
return Date.valueOf(date.split(" ")[0]).getTime();
if (type == Time.class)
return Time.valueOf(date).getTime();
throw new SQLException("Could not parse date " + date, e);
}
}