diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
index 270639195e..c8a22ea60d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 46058837cf..ee806e5f69 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index 143ae63c99..c79a3d4f47 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index e3c1e8b046..010b8e9725 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index c7594927e7..136112646d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
index 8b5ae4fc77..7939e41f43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
index 7972d52810..cbfa014d86 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index ec95644134..c6f85f5571 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index 5f5128dc79..104eb17745 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
index ccfafe66b3..bbbb4e63ea 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index 46bb0cdcb3..35cb5f481b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index e7ef4c9dd1..f0e41a2d8a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -14953,6 +14953,24 @@ public class DSL {
         return new CharLength(string);
     }
 
+    /**
+     * The <code>DEG</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<BigDecimal> deg(Number radians) {
+        return new Degrees(Tools.field(radians));
+    }
+
+    /**
+     * The <code>DEG</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<BigDecimal> deg(Field<? extends Number> radians) {
+        return new Degrees(radians);
+    }
+
     /**
      * The <code>LEFT</code> function.
      */
@@ -15313,6 +15331,24 @@ public class DSL {
         return new Position(in, search);
     }
 
+    /**
+     * The <code>RAD</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<BigDecimal> rad(Number degrees) {
+        return new Radians(Tools.field(degrees));
+    }
+
+    /**
+     * The <code>RAD</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<BigDecimal> rad(Field<? extends Number> degrees) {
+        return new Radians(degrees);
+    }
+
     /**
      * The <code>REPEAT</code> function.
      */
@@ -15577,6 +15613,9 @@ public class DSL {
 
 
 
+
+
+
     /**
      * The <code>SIGN</code> function.
      */
@@ -20120,54 +20159,6 @@ public class DSL {
         );
     }
 
-    /**
-     * Calculate degrees from radians from this field.
-     *
-     * @see #deg(Field)
-     */
-    @NotNull
-    @Support
-    public static Field<BigDecimal> deg(Number value) {
-        return deg(Tools.field(value));
-    }
-
-    /**
-     * Calculate degrees from radians from this field.
-     * <p>
-     * This renders the degrees function where available:
-     * <code><pre>degrees([field])</pre></code> ... or emulates it elsewhere:
-     * <code><pre>[field] * 180 / PI</pre></code>
-     */
-    @NotNull
-    @Support
-    public static Field<BigDecimal> deg(Field<? extends Number> field) {
-        return new Degrees(Tools.nullSafe(field));
-    }
-
-    /**
-     * Calculate radians from degrees from this field.
-     *
-     * @see #rad(Field)
-     */
-    @NotNull
-    @Support
-    public static Field<BigDecimal> rad(Number value) {
-        return rad(Tools.field(value));
-    }
-
-    /**
-     * Calculate radians from degrees from this field.
-     * <p>
-     * This renders the degrees function where available:
-     * <code><pre>degrees([field])</pre></code> ... or emulates it elsewhere:
-     * <code><pre>[field] * PI / 180</pre></code>
-     */
-    @NotNull
-    @Support
-    public static Field<BigDecimal> rad(Field<? extends Number> field) {
-        return new Radians(Tools.nullSafe(field));
-    }
-
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 4e58531544..bce682f294 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -37,34 +37,48 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.DSL.inline;
-import static org.jooq.impl.DSL.pi;
-import static org.jooq.impl.Names.N_DEGREES;
-import static org.jooq.impl.Tools.castIfNeeded;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.Internal.*;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
+import static org.jooq.impl.Tools.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.math.BigDecimal;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.Context;
-import org.jooq.Field;
+import java.math.*;
+import java.util.*;
 
 /**
- * @author Lukas Eder
+ * The <code>DEG</code> statement.
  */
-final class Degrees extends AbstractField<BigDecimal> {
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+final class Degrees
+extends
+    AbstractField<BigDecimal>
+{
 
-    /**
-     * Generated UID
-     */
-    private static final long serialVersionUID = -7273879239726265322L;
+    private static final long serialVersionUID = 1L;
 
-    private final Field<?>    argument;
+    private final Field<? extends Number> radians;
 
-    Degrees(Field<?> argument) {
-        super(N_DEGREES, SQLDataType.NUMERIC);
+    Degrees(
+        Field<? extends Number> radians
+    ) {
+        super(N_DEGREES, allNotNull(NUMERIC, radians));
 
-        this.argument = argument;
+        this.radians = nullSafeNotNull(radians, INTEGER);
     }
 
+    // -------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // -------------------------------------------------------------------------
+
+
+
     @Override
     public final void accept(Context<?> ctx) {
         switch (ctx.family()) {
@@ -79,12 +93,14 @@ final class Degrees extends AbstractField<BigDecimal> {
 
             case FIREBIRD:
             case SQLITE:
-                ctx.visit(castIfNeeded(argument, BigDecimal.class).mul(inline(180)).div(pi()));
+                ctx.visit(castIfNeeded(radians, BigDecimal.class).mul(inline(180)).div(pi()));
                 break;
 
             default:
-                ctx.visit(N_DEGREES).sql('(').visit(argument).sql(')');
+                ctx.visit(N_DEGREES).sql('(').visit(radians).sql(')');
                 break;
         }
     }
+
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index c8a6ed43f6..13095e442b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index a0ac679c8b..9803878622 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
index 14e8d14792..53efadbd58 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 362339d2d8..830cdf9288 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
index 53f3f60d41..75962721a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index c9658f2db4..06fb32e9e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
index 8ae2b3c617..73ec9c6ee4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
index 3543de173f..c73065a541 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index fe1179ed2a..e42ddb9e0a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
index 447841775f..ff5c942f79 100644
--- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index faba28b721..c3fa79bad6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index becb35b1d3..09eab0bcfe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 729b2b979b..35c2e3357e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -37,36 +37,48 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.DSL.function;
-import static org.jooq.impl.DSL.inline;
-import static org.jooq.impl.DSL.pi;
-import static org.jooq.impl.Names.N_RADIANS;
-import static org.jooq.impl.SQLDataType.NUMERIC;
-import static org.jooq.impl.Tools.castIfNeeded;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.Internal.*;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
+import static org.jooq.impl.Tools.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.math.BigDecimal;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.Context;
-import org.jooq.Field;
+import java.math.*;
+import java.util.*;
 
 /**
- * @author Lukas Eder
+ * The <code>RAD</code> statement.
  */
-final class Radians extends AbstractField<BigDecimal> {
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+final class Radians
+extends
+    AbstractField<BigDecimal>
+{
 
-    /**
-     * Generated UID
-     */
-    private static final long serialVersionUID = -7273879239726265322L;
+    private static final long serialVersionUID = 1L;
 
-    private final Field<?>    argument;
+    private final Field<? extends Number> degrees;
 
-    Radians(Field<?> argument) {
-        super(N_RADIANS, NUMERIC);
+    Radians(
+        Field<? extends Number> degrees
+    ) {
+        super(N_RADIANS, allNotNull(NUMERIC, degrees));
 
-        this.argument = argument;
+        this.degrees = nullSafeNotNull(degrees, INTEGER);
     }
 
+    // -------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // -------------------------------------------------------------------------
+
+
+
     @Override
     public final void accept(Context<?> ctx) {
         switch (ctx.family()) {
@@ -78,12 +90,14 @@ final class Radians extends AbstractField<BigDecimal> {
 
             case FIREBIRD:
             case SQLITE:
-                ctx.visit(castIfNeeded(argument, BigDecimal.class).mul(pi()).div(inline(180)));
+                ctx.visit(castIfNeeded(degrees, BigDecimal.class).mul(pi()).div(inline(180)));
                 return;
 
             default:
-                ctx.visit(function(N_RADIANS, NUMERIC, argument));
+                ctx.visit(function(N_RADIANS, NUMERIC, degrees));
                 return;
         }
     }
+
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index 1327661996..fe3f75048c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index f68664f41b..f3f9b225ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
index cd5e24c101..531b5397af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
index acdfa181f5..64f6f9c1c9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
index d90f11747e..93cee86a1e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Right.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
index 197b988392..f8e5a6e95b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
@@ -94,5 +94,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index 59b08f0c13..e84898eeed 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index b2327a0848..ff1c0686fb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java
index 454811e917..e62098cdb5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Space.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Space.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
index 833d12042a..192271204b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index cc7e57f242..8e50ab0c22 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java
index c5756b22fc..29fd187e2f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Translate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index 0914e9b0a2..cc9dada211 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java
index d7e401a16e..692b64095a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Upper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.*;
 import org.jooq.*;
 import org.jooq.impl.*;
 
+import java.math.*;
 import java.util.*;
 
 /**