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

[#8013] Regression in OffsetDateTime parser when PostgreSQL timestamps have fractional seconds of 1, 2, 4, 5 digit precision

Browse Source
This commit is contained in:
lukaseder 2018-11-05 10:05:07 +01:00
parent fcf8fe5830
commit 05058a501c
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2485,17 +2485,8 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
if (parseCharIf(string, position, ':')) {
second = parseInt(string, position, 2);
if (parseCharIf(string, position, '.')) {
nano = 1000000 * parseInt(string, position, 3);
if (Character.isDigit(string.charAt(position[0]))) {
nano = nano + 1000 * parseInt(string, position, 3);
if (Character.isDigit(string.charAt(position[0]))) {
nano = nano + parseInt(string, position, 3);
}
}
}
if (parseCharIf(string, position, '.'))
nano = parseInt(string, position, 9, true);
}
return LocalTime.of(hour, minute, second, nano);
@ -2543,8 +2534,10 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
private static final boolean parseCharIf(String string, int[] position, char expected) {
boolean result = string.length() > position[0] && string.charAt(position[0]) == expected;
if (result)
position[0] = position[0] + 1;
return result;
}
@ -2553,19 +2546,29 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
throw new IllegalArgumentException("Expected '" + expected + "' at position " + position[0] + " in " + string);
}
private static final int parseInt(String string, int[] position, int length) {
int result = 0;
private static final int parseInt(String string, int[] position, int maxLength) {
return parseInt(string, position, maxLength, false);
}
for (int i = position[0] + length - 1, dec = 1; i >= position[0]; i--, dec = dec * 10) {
int digit = string.charAt(i) - '0';
private static final int parseInt(String string, int[] position, int maxLength, boolean rightPad) {
int result = 0;
int pos = position[0];
int length;
for (length = 0; length < maxLength && length < string.length(); length++) {
int digit = string.charAt(pos + length) - '0';
if (digit >= 0 && digit < 10)
result = result + dec * digit;
result = result * 10 + digit;
else
throw new NumberFormatException("Not a number: " + string);
break;
}
position[0] = position[0] + length;
if (rightPad && length < maxLength && result > 0)
for (int i = length; i < maxLength; i++)
result = result * 10;
position[0] = pos + length;
return result;
}
}