From 57cabbb05a2595d1a2f61b68e10cdfca12b02864 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 22 Oct 2021 17:28:38 +0200
Subject: [PATCH] [jOOQ/jOOQ#12544] Field<Instant>.div(int) regression for
 Instant fields that have a converter

---
 jOOQ/src/main/java/org/jooq/impl/AbstractField.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<T> extends AbstractTypedNamed<T> implements Field<T
 
     @Override
     public final Field<T> mul(Field<? extends Number> 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<T> extends AbstractTypedNamed<T> implements Field<T
 
     @Override
     public final Field<T> div(Field<? extends Number> value) {
-        return new Expression<>(DIVIDE, false, this, nullSafe(value, getDataType()));
+        return new Expression<>(DIVIDE, false, this, getDataType().isTemporal() ? nullSafe(value) : nullSafe(value, getDataType()));
     }
 
     // ------------------------------------------------------------------------