From 92ecc6788efe9ab855b13e40bf841dc0272974fe Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 10 Dec 2020 11:06:55 +0100
Subject: [PATCH] [jOOQ/jOOQ#11061] [jOOQ/jOOQ#11070] [jOOQ/jOOQ#11091] Fixed
 regression

DSL::abs must maintain the input data type, not override it with the default INTEGER type
---
 jOOQ/src/main/java/org/jooq/impl/Abs.java   | 2 +-
 jOOQ/src/main/java/org/jooq/impl/Tools.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
index c8a22ea60d..a49536a140 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -68,7 +68,7 @@ extends
     Abs(
         Field<T> number
     ) {
-        super(N_ABS, allNotNull((DataType) INTEGER, number));
+        super(N_ABS, allNotNull((DataType) dataType(INTEGER, number, false), number));
 
         this.number = nullSafeNotNull(number, INTEGER);
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 7a0bcbfb44..92add49ac7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -5896,12 +5896,12 @@ final class Tools {
         return result;
     }
 
-    private static final DataType<?> dataType(Field<?> field) {
+    static final DataType<?> dataType(Field<?> field) {
         return dataType(OTHER, field, false);
     }
 
     @SuppressWarnings("unchecked")
-    private static final <T> DataType<T> dataType(DataType<T> defaultType, Field<?> field, boolean preferDefault) {
+    static final <T> DataType<T> dataType(DataType<T> defaultType, Field<?> field, boolean preferDefault) {
         return field == null
              ? defaultType
              : preferDefault && field.getType() != defaultType.getType()