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

[#8077] Add org.jooq.types.YearToSecond to support PostgreSQL mixed interval values

Browse Source
This commit is contained in:
lukaseder 2018-11-30 13:34:22 +01:00
parent 4cb0990735
commit 422832ec21
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jOOQ/src/main/java/org/jooq/types/DayToSecond.java
View File

@ -44,7 +44,6 @@ import java.util.regex.Pattern;
import org.jooq.Field;
import org.jooq.SQLDialect;
import org.jooq.tools.Convert;
import org.jooq.tools.StringUtils;
/**
@ -130,7 +129,7 @@ public final class DayToSecond extends Number implements Interval, Comparable<Da
this(days, hours, minutes, seconds, nano, false);
}
private DayToSecond(int days, int hours, int minutes, int seconds, int nano, boolean negative) {
DayToSecond(int days, int hours, int minutes, int seconds, int nano, boolean negative) {
// Perform normalisation. Specifically, Postgres may return intervals
// such as 24:00:00, 25:13:15, etc...
@ -169,7 +168,8 @@ public final class DayToSecond extends Number implements Interval, Comparable<Da
*/
public static DayToSecond valueOf(String string) {
if (string != null) {
// Accept also doubles as the number of days
// Accept also doubles as the number of milliseconds
try {
return valueOf(Double.valueOf(string));
}
@ -177,15 +177,7 @@ public final class DayToSecond extends Number implements Interval, Comparable<Da
Matcher matcher = PATTERN.matcher(string);
if (matcher.find()) {
boolean negative = "-".equals(matcher.group(1));
int days = Convert.convert(matcher.group(2), int.class);
int hours = Convert.convert(matcher.group(3), int.class);
int minutes = Convert.convert(matcher.group(4), int.class);
int seconds = Convert.convert(matcher.group(5), int.class);
int nano = Convert.convert(StringUtils.rightPad(matcher.group(6), 9, "0"), int.class);
return new DayToSecond(days, hours, minutes, seconds, nano, negative);
return YearToSecond.parseDS(matcher, 0);
}

8
jOOQ/src/main/java/org/jooq/types/YearToMonth.java
View File

@ -100,7 +100,7 @@ public final class YearToMonth extends Number implements Interval, Comparable<Ye
this(years, months, false);
}
private YearToMonth(int years, int months, boolean negative) {
YearToMonth(int years, int months, boolean negative) {
// Perform normalisation. Specifically, Postgres may return intervals
// such as 0-13
@ -127,11 +127,7 @@ public final class YearToMonth extends Number implements Interval, Comparable<Ye
Matcher matcher;
if ((matcher = PATTERN_SQL.matcher(string)).find()) {
boolean negative = "-".equals(matcher.group(1));
int years = Integer.parseInt(matcher.group(2));
int months = Integer.parseInt(matcher.group(3));
return new YearToMonth(years, months, negative);
return YearToSecond.parseYM(matcher, 0);
}
if ((matcher = PATTERN_ISO.matcher(string)).find()) {