diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt
index 420c6aaf44..cb3b07cd64 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.12.txt
@@ -718,7 +718,7 @@ term =
 | 'CHOOSE' '(' field { ',' field } ')'
 | 'COALESCE' '(' fields ')'
 | 'CONCAT' '(' fields ')'
-| 'CONVERT' '(' dataType ',' field ')'
+| 'CONVERT' '(' dataType ',' field [ ',' unsignedInteger ] ')'
 | 'COS' '(' numericOp ')'
 | 'COSH' '(' numericOp ')'
 | 'COT' '(' numericOp ')'
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java b/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java
new file mode 100644
index 0000000000..bdcbdba8fd
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java
@@ -0,0 +1,160 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Other licenses:
+ * -----------------------------------------------------------------------------
+ * Commercial licenses for this work are available. These replace the above
+ * ASL 2.0 and offer limited warranties, support, maintenance, and commercial
+ * database integrations.
+ *
+ * For more information, please visit: http://www.jooq.org/licenses
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+package org.jooq.impl;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 8b9102bea2..be8942d82a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -12166,6 +12166,40 @@ public class DSL {
         return nullSafe(field).coerce(as);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * Cast a value to the type of another field.
      *
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index cd6f499fad..c918e6ed0e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -7281,9 +7281,17 @@ final class ParserImpl implements Parser {
             DataType<?> type = parseDataType(ctx);
             parse(ctx, ',');
             Field<?> field = parseField(ctx);
+            Long style = null;
+            if (parseIf(ctx, ',') && ctx.requireProEdition())
+                style = parseUnsignedInteger(ctx);
             parse(ctx, ')');
 
-            return cast(field, type);
+            if (style == null)
+                return cast(field, type);
+
+
+
+
         }
 
         return null;