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

[jOOQ/jOOQ#12036] ¨Timestamp Arithmetic fails with ConvertedDataType

Browse Source
This commit is contained in:
Lukas Eder 2022-01-25 17:17:51 +01:00
parent 736ce26f91
commit 5dd3e641c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ/src/main/java/org/jooq/impl/AbstractField.java
View File

@ -921,12 +921,12 @@ abstract class AbstractField<T> extends AbstractTypedNamed<T> implements Field<T
@SuppressWarnings("unchecked")
@Override
public final Field<T> add(Field<?> value) {
Field<?> rhs = nullSafe(value, getDataType());
Field<?> rhs;
if (getDataType().isDateTime() && (rhs.getDataType().isNumeric() || rhs.getDataType().isInterval()))
if (getDataType().isDateTime() && ((rhs = nullSafe(value)).getDataType().isNumeric() || rhs.getDataType().isInterval()))
return new Expression<>(ADD, false, this, rhs);
else
return new Add<T>(this, (Field<T>) rhs);
return new Add<T>(this, (Field<T>) nullSafe(value, getDataType()));
}
@Override
@ -937,12 +937,12 @@ abstract class AbstractField<T> extends AbstractTypedNamed<T> implements Field<T
@SuppressWarnings("unchecked")
@Override
public final Field<T> sub(Field<?> value) {
Field<?> rhs = nullSafe(value, getDataType());
Field<?> rhs;
if (getDataType().isDateTime() && (rhs.getDataType().isNumeric() || rhs.getDataType().isInterval()))
if (getDataType().isDateTime() && ((rhs = nullSafe(value)).getDataType().isNumeric() || rhs.getDataType().isInterval()))
return new Expression<>(SUBTRACT, false, this, rhs);
else
return new Sub<T>(this, (Field<T>) rhs);
return new Sub<T>(this, (Field<T>) nullSafe(value, getDataType()));
}
@Override