diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java index 2a6c3c1a0d..3e49e47c70 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java @@ -940,7 +940,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field mul(Field value) { - return new Expression<>(MULTIPLY, false, this, nullSafe(value, getDataType())); + return new Expression<>(MULTIPLY, false, this, getDataType().isTemporal() ? nullSafe(value) : nullSafe(value, getDataType())); } @Override @@ -950,7 +950,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field div(Field value) { - return new Expression<>(DIVIDE, false, this, nullSafe(value, getDataType())); + return new Expression<>(DIVIDE, false, this, getDataType().isTemporal() ? nullSafe(value) : nullSafe(value, getDataType())); } // ------------------------------------------------------------------------