diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
index 100b508246..32f4ccc52e 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java
@@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
index 475631dfc8..9363e86994 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
@@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 import static org.jooq.SQLDialect.MARIADB;
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 8c4408fe2d..65f7c66b8e 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
index ee1e1853eb..d7d6a86478 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
@@ -41,9 +41,11 @@
 
 package org.jooq.impl;
 
+import static java.util.Arrays.asList;
 import static org.jooq.ExecuteType.DDL;
 // ...
 // ...
+// ...
 import static org.jooq.conf.ParamType.INDEXED;
 import static org.jooq.conf.ParamType.INLINED;
 import static org.jooq.conf.SettingsTools.executePreparedStatements;
@@ -427,7 +429,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
         /* [pro] xx
 
         xx xxxxxxx xxxxxx xxx xxxxxxxxxx xx xxx xxxxxxx xxxx xxxxxx
-        xx xxxxxxxxxxx xx xxx xx xxxxxxxxxxxx xx xxxxxxx x
+        xx xxxxxxxxxxx xx xxx xx xxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
             xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx
             xxxxxx xxxxxxxxxxxxxxxx
         x
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index 45fea0fc53..21087610d0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -40,6 +40,7 @@
  */
 package org.jooq.impl;
 
+// ...
 // ...
 import static org.jooq.conf.RenderNameStyle.LOWER;
 import static org.jooq.conf.RenderNameStyle.UPPER;
@@ -245,6 +246,14 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
             return;
         }
 
+        /* [pro] xx
+        xx xxxx xxxxxxx xxxxxxx xxxxxxxx xxxxxxxxx xxxx
+        xxxx xx xxxxxxxxxxxxx xx xxxxx x
+            xxxxxxxxxxxxxxxxxxx
+            xxxxxxx
+        x
+        xx [/pro] */
+
         // Values should be returned from the INSERT
         else {
             switch (ctx.family()) {
@@ -319,6 +328,12 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
         if (returning.isEmpty()) {
             return super.execute(ctx, listener);
         }
+        /* [pro] xx
+        xx xxxx xxxxxxx xxxxxxx xxxxxxxx xxxxxxxxx xxxx
+        xxxx xx xxxxxxxxxxxxx xx xxxxx x
+            xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxx
+        x
+        xx [/pro] */
         else {
             int result = 1;
             ResultSet rs;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java
index 7184466811..8fdf8770fa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Alias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java
@@ -54,6 +54,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 8e855d3038..bd74c4bd37 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -40,10 +40,12 @@
  */
 package org.jooq.impl;
 
+import static java.util.Arrays.asList;
 import static org.jooq.Clause.ALTER_SEQUENCE;
 import static org.jooq.Clause.ALTER_SEQUENCE_RESTART;
 import static org.jooq.Clause.ALTER_SEQUENCE_SEQUENCE;
 // ...
+// ...
 
 import org.jooq.AlterSequenceFinalStep;
 import org.jooq.AlterSequenceRestartStep;
@@ -107,7 +109,7 @@ class AlterSequenceImpl<T extends Number> extends AbstractQuery implements
         if (with == null) {
 
             /* [pro] xx
-            xx xxxxxxxxxxxxx xx xxxxxxxxx
+            xx xxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
                 xxxxxxxxx xxxxxxxxxxxxxxxxxxx xxxx xxxx
             xxxx
             xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 2d8265ce7e..f41a110b2f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -48,6 +48,7 @@ import static org.jooq.Clause.ALTER_TABLE_DROP;
 import static org.jooq.Clause.ALTER_TABLE_TABLE;
 import static org.jooq.SQLDialect.FIREBIRD;
 // ...
+// ...
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.name;
@@ -194,8 +195,14 @@ class AlterTableImpl extends AbstractQuery implements
 
         if (add != null) {
             ctx.start(ALTER_TABLE_ADD)
-               .sql(" ").keyword("add").sql(" ")
-               .qualify(false)
+               .sql(" ").keyword("add").sql(" ");
+
+            /* [pro] xx
+            xx xxxxxxx xx xxxxx
+                xxxxxxxxxxxxx
+            xx [/pro] */
+
+            ctx.qualify(false)
                .visit(add).sql(" ")
                .qualify(true)
                 // [#3341] This is currently incorrect for MySQL and MariaDB
@@ -211,6 +218,11 @@ class AlterTableImpl extends AbstractQuery implements
                 ctx.sql(" ").keyword("null");
             }
 
+            /* [pro] xx
+            xx xxxxxxx xx xxxxx
+                xxxxxxxxxxxxx
+            xx [/pro] */
+
             ctx.end(ALTER_TABLE_ADD);
         }
         else if (alter != null) {
@@ -295,6 +307,10 @@ class AlterTableImpl extends AbstractQuery implements
                 xxxx xxxxxxxxxx
                     xxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx
                     xxxxxx
+
+                xxxx xxxxx
+                    xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                    xxxxxx
                 xx [/pro] */
 
                 default:
@@ -307,6 +323,17 @@ class AlterTableImpl extends AbstractQuery implements
                .visit(drop)
                .qualify(true);
 
+            switch (family) {
+                /* [pro] xx
+                xxxx xxxxx
+                    xxxxxxxxxxxxx
+                    xxxxxx
+                xx [/pro] */
+
+                default:
+                    break;
+            }
+
             if (dropCascade) {
                 ctx.sql(" ").keyword("cascade");
             }
diff --git a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
index 9e00f3d84e..071cae5774 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
@@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 // ...
+// ...
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
index 4c26d5e0d5..d67ac875dc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
@@ -72,6 +72,7 @@ class ConditionAsField extends AbstractFunction<Boolean> {
             // are expected.
             /* [pro] xx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 7d948a0858..ac05190623 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -48,6 +48,7 @@ import static org.jooq.Clause.CREATE_TABLE_NAME;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.Utils.DATA_SELECT_INTO_TABLE;
@@ -183,12 +184,33 @@ class CreateTableImpl<R extends Record> extends AbstractQuery implements
            .visit(table)
            .end(CREATE_TABLE_NAME)
            .formatSeparator()
-           .keyword("as")
-           .formatSeparator()
-           .start(CREATE_TABLE_AS)
+           .keyword("as");
+
+        /* [pro] xx
+        xx xxxxxxxxxxxxx xx xxxxx x
+            xxxxxxxxx xxx
+               xxxxxxxxxxxxxxxxxxxx
+               xxxxxxxxxxxxxxxxx
+        x
+        xxxx
+        xx [/pro] */
+        {
+            ctx.formatSeparator();
+        }
+
+        ctx.start(CREATE_TABLE_AS)
            .visit(select)
-           .end(CREATE_TABLE_AS)
-           .end(CREATE_TABLE);
+           .end(CREATE_TABLE_AS);
+
+        /* [pro] xx
+        xx xxxxxxxxxxxxx xx xxxxx x
+            xxxxxxxxxxxxxxxxxxxxx
+               xxxxxxxxxxxxxxxx
+               xxxxxxxxxx
+        x
+        xx [/pro] */
+
+        ctx.end(CREATE_TABLE);
     }
 
     private final void acceptSelectInto(Context<?> ctx) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index e6af0876a5..a8d0e36495 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -4224,7 +4224,7 @@ public class DSL {
      */
     @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     public static CreateTableAsStep<Record> createTable(String tableName) {
-        return createTable(tableByName(tableName));
+        return createTable(table(name(tableName)));
     }
 
     /**
@@ -6565,7 +6565,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1> Field<Record1<T1>> field(Row1<T1> row) {
         return new RowField<Row1<T1>, Record1<T1>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>2</code> into a {@code Field}.
@@ -6578,7 +6578,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2> Field<Record2<T1, T2>> field(Row2<T1, T2> row) {
         return new RowField<Row2<T1, T2>, Record2<T1, T2>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>3</code> into a {@code Field}.
@@ -6591,7 +6591,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3> Field<Record3<T1, T2, T3>> field(Row3<T1, T2, T3> row) {
         return new RowField<Row3<T1, T2, T3>, Record3<T1, T2, T3>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>4</code> into a {@code Field}.
@@ -6604,7 +6604,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4> Field<Record4<T1, T2, T3, T4>> field(Row4<T1, T2, T3, T4> row) {
         return new RowField<Row4<T1, T2, T3, T4>, Record4<T1, T2, T3, T4>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>5</code> into a {@code Field}.
@@ -6617,7 +6617,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5> Field<Record5<T1, T2, T3, T4, T5>> field(Row5<T1, T2, T3, T4, T5> row) {
         return new RowField<Row5<T1, T2, T3, T4, T5>, Record5<T1, T2, T3, T4, T5>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>6</code> into a {@code Field}.
@@ -6630,7 +6630,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6> Field<Record6<T1, T2, T3, T4, T5, T6>> field(Row6<T1, T2, T3, T4, T5, T6> row) {
         return new RowField<Row6<T1, T2, T3, T4, T5, T6>, Record6<T1, T2, T3, T4, T5, T6>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>7</code> into a {@code Field}.
@@ -6643,7 +6643,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7> Field<Record7<T1, T2, T3, T4, T5, T6, T7>> field(Row7<T1, T2, T3, T4, T5, T6, T7> row) {
         return new RowField<Row7<T1, T2, T3, T4, T5, T6, T7>, Record7<T1, T2, T3, T4, T5, T6, T7>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>8</code> into a {@code Field}.
@@ -6656,7 +6656,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8> Field<Record8<T1, T2, T3, T4, T5, T6, T7, T8>> field(Row8<T1, T2, T3, T4, T5, T6, T7, T8> row) {
         return new RowField<Row8<T1, T2, T3, T4, T5, T6, T7, T8>, Record8<T1, T2, T3, T4, T5, T6, T7, T8>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>9</code> into a {@code Field}.
@@ -6669,7 +6669,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9> Field<Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> field(Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> row) {
         return new RowField<Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9>, Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>10</code> into a {@code Field}.
@@ -6682,7 +6682,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Field<Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> field(Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> row) {
         return new RowField<Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>11</code> into a {@code Field}.
@@ -6695,7 +6695,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Field<Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> field(Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> row) {
         return new RowField<Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>12</code> into a {@code Field}.
@@ -6708,7 +6708,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Field<Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> field(Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> row) {
         return new RowField<Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>13</code> into a {@code Field}.
@@ -6721,7 +6721,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Field<Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> field(Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> row) {
         return new RowField<Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>14</code> into a {@code Field}.
@@ -6734,7 +6734,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Field<Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> field(Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> row) {
         return new RowField<Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>15</code> into a {@code Field}.
@@ -6747,7 +6747,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Field<Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> field(Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> row) {
         return new RowField<Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>16</code> into a {@code Field}.
@@ -6760,7 +6760,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Field<Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> field(Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> row) {
         return new RowField<Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>, Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>17</code> into a {@code Field}.
@@ -6773,7 +6773,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Field<Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> field(Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> row) {
         return new RowField<Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>, Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>18</code> into a {@code Field}.
@@ -6786,7 +6786,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Field<Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> field(Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> row) {
         return new RowField<Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>, Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>19</code> into a {@code Field}.
@@ -6799,7 +6799,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Field<Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> field(Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> row) {
         return new RowField<Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>, Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>20</code> into a {@code Field}.
@@ -6812,7 +6812,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> Field<Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> field(Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> row) {
         return new RowField<Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>, Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>21</code> into a {@code Field}.
@@ -6825,7 +6825,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> Field<Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> field(Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> row) {
         return new RowField<Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>, Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>>(row);
-    }                
+    }
 
     /**
      * Turn a row value expression of degree <code>22</code> into a {@code Field}.
@@ -6838,7 +6838,7 @@ public class DSL {
     @Support({ POSTGRES })
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Field<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> field(Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> row) {
         return new RowField<Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>, Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>>(row);
-    }                
+    }
 
 // [jooq-tools] END [row-field]
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
index 184571de2a..34494731c4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
@@ -43,6 +43,7 @@ package org.jooq.impl;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.DSL.keyword;
+import static org.jooq.impl.DSL.sql;
 
 import java.sql.Date;
 
@@ -203,6 +204,25 @@ class DateAdd<T extends java.util.Date> extends AbstractFunction<T> {
                 xxxxxx xxxxxxxxxxxxxxxxxxxxx xxxx xxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxx
             x
 
+            xxxx xxxxx x
+                xxxxxx xxxxxxxxxx x xxxxx
+
+                xxxxxx xxxxxxxxxx x
+                    xxxx xxxxx   xxxxxxx x xxxxxxxxxxxx                        xxxxxx
+                    xxxx xxxxxx  xxxxxxx x xxxxxxxxxxxxx                       xxxxxx
+                    xxxx xxxx    xxxxxxx x xxxxxxxxxxx                         xxxxxx
+                    xxxx xxxxx   xxxxxxx x xxxxxxxxxxxxxx xxxxxxxxxx x xxxxxxx xxxxxx
+                    xxxx xxxxxxx xxxxxxx x xxxxxxxxxxxxxx xxxxxxxxxx x xxxxx   xxxxxx
+                    xxxx xxxxxxx xxxxxxx x xxxxxxxxxxxxxx                      xxxxxx
+                    xxxxxxxx xxxxxxxxxxxxxxxxxxx
+                x
+
+                xx xxxxxxxxxxx xx xxxxx
+                    xxxxxx xxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx xxxxxxxxxx
+                xxxx
+                    xxxxxx xxxxxxxxxxxxxxx xxx x xxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxx xxxxx xxxxxxxxx xxxxxxxxxxxxxxxxx
+            x
+
             xxxx xxxxxxxxx x
                 xxxxxx xxxxxxxxxx x
                     xxxx xxxxx   xxxxxxx x xxxxxxx   xxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
index 3d7dbb729d..1802db921d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
@@ -108,6 +108,9 @@ class DateDiff extends AbstractFunction<Integer> {
                 xxxxxx xxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxx
                        xxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxx
 
+            xxxx xxxxx
+                xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxxxx xxxxxxx
+
             xx xxxx xxxxxxx xx xxxxxxx
             xxxx xxxxxxx
             xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Decode.java b/jOOQ/src/main/java/org/jooq/impl/Decode.java
index d90059e2ce..2870765d41 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Decode.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Decode.java
@@ -76,7 +76,11 @@ class Decode<T, Z> extends AbstractFunction<Z> {
         switch (configuration.dialect().family()) {
 
             /* [pro] xx
-            xx xxxxxx xxxxxxxx xxx xxxx xxxxxxxx
+            xx xxxx xxx xxxxxx xxxxxxxx xxxx xxxx xxxxxxxx
+            xxxx xxxxx x
+                xxxxxx xxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxx
+            x
+
             xxxx xxxxxxx x
                 xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxx
             x
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index 8d95d50ebc..80035bcfc6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index f84e3bfabb..3e627c5ddf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -74,6 +74,7 @@ class Degrees extends AbstractFunction<BigDecimal> {
             xxxx xxxxxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index 89749edb90..bd9cd461b5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -51,6 +51,7 @@ import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 // ...
+// ...
 import static org.jooq.impl.DropStatementType.VIEW;
 
 import org.jooq.Clause;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index 9ca14c718f..cf6b58958a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -70,6 +70,7 @@ class Euler extends AbstractFunction<BigDecimal> {
             xxxx xxxxxxx
             xxxx xxxx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java
index 6c92dfbd26..c5cdfe0a1e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Expression.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java
@@ -492,6 +492,15 @@ class Expression<T> extends AbstractFunction<T> {
                     x
                 x
 
+                xxxx xxxxx x
+                    xx xxxxxxxxx xx xxxx x
+                        xxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxx xxxxxxxxxxxxxxx
+                    x
+                    xxxx x
+                        xxxxxx xxxxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxxx
+                    x
+                x
+
                 xxxx xxxx
                 xxxx xxxxxxxxxx
                 xxxx xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
index 34450b9eef..639c3af877 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
@@ -78,6 +78,7 @@ class FieldCondition extends AbstractCondition {
             /* [pro] xx
             xx xxxxx xx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
index 5bf5ed58cb..48f4ca5188 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
@@ -112,6 +112,7 @@ class FieldMapsForInsert extends AbstractQueryPart {
                 x
 
                 xxxx xxxx
+                xxxx xxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxx
                 xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
index 2f93fc5df2..cc48db0129 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
@@ -74,6 +74,7 @@ import static org.jooq.SQLDialect.H2;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.impl.DSL.condition;
 import static org.jooq.impl.DSL.exists;
 import static org.jooq.impl.DSL.notExists;
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java
index 4230b7e869..72391b0cd6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java
@@ -73,6 +73,7 @@ class NotField extends AbstractField<Boolean> {
             /* [pro] xx
             xx xxxxx xx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 243191a27a..cb423adb14 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -69,6 +69,7 @@ class Pi extends AbstractFunction<BigDecimal> {
         switch (configuration.dialect().family()) {
             /* [pro] xx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxxxx
             xxxx xxxxxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index f6939c06ec..7e94d22131 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -73,6 +73,7 @@ class Position extends AbstractFunction<Integer> {
                 return field("{locate}({0}, {1})", SQLDataType.INTEGER, search, in);
 
             /* [pro] xx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxxxxxxxx xxx xxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 6fba405483..6a62d14cbe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -72,6 +72,7 @@ class Radians extends AbstractFunction<BigDecimal> {
         switch (configuration.dialect().family()) {
             /* [pro] xx
             xxxx xxxxxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
             xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index dc2c8364a8..1887fc5427 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -79,6 +79,7 @@ class Replace extends AbstractFunction<String> {
 
             xxxx xxxxxxx
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
             xxxx xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
index b0182a38fc..c0f47a130c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
@@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
index bede4b7c66..d9bf468866 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
@@ -58,6 +58,7 @@ import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
index d4d14147ec..e56bbc78bb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
@@ -53,6 +53,7 @@ import static org.jooq.Comparator.NOT_IN;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 // ...
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
index 3c366b657c..af0d4df438 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
@@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
index 3d51ca3bb9..bf1119e0e3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
@@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index fdd6a07a71..57fc745ad7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -67,6 +67,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java
index 9c530ca349..a20acb3a93 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Term.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Term.java
@@ -80,6 +80,7 @@ enum Term {
                     xxxxxx xx x xxxxxxxxx
 
                 xxxx xxxx
+                xxxx xxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxx
                 xx [/pro] */
@@ -165,6 +166,7 @@ enum Term {
                     xxxxxx xxxxxxxxxx
 
                 xxxx xxxx
+                xxxx xxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxx
                 xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index f1a6e3224a..c867b6d21c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -43,6 +43,7 @@ package org.jooq.impl;
 import static java.math.BigDecimal.TEN;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.keyword;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.zero;
 import static org.jooq.impl.Utils.extractVal;
@@ -111,7 +112,10 @@ class Trunc<T> extends AbstractFunction<T> {
                 return field("{trunc}({0}, {1})", SQLDataType.NUMERIC, field.cast(BigDecimal.class), decimals).cast(field.getDataType());
 
             /* [pro] xx
-            xx xxx xxxxxxxx xxxxx xxxxxxxx xxx xx xxxx xx xxxxxxxxx
+            xx xxxx xxx xxx xxxxxxxx xxxxx xxxxxxxx xxx xx xxxx xx xxxxxxxxx
+            xxxx xxxxx
+                xxxxxx xxxxxxxxxxxxxxxxxxx xxxx xxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
+
             xxxx xxxxxxxxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxx xxxx xxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxx xxxxxxx
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
index ec741e4eb1..828fcc9101 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
@@ -179,6 +179,17 @@ class TruncDate<T extends java.util.Date> extends AbstractFunction<T> {
                 xxxxxx xxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxx
             x
 
+            xx xx xxxxx xxxxxxxxxx xxxx xxx xxxxx xxx xx xxxxxxxxx xx xxxxxxx xxxx xx xxxx
+            xxxx xxxxx x
+                xxxxxx xxxxxx x
+                    xxxx xxxx
+                        xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+                    xxxxxxxx
+                        xxxxxx xxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxxxxxxxxx xxxxx xxxxxxxxxxxxxxxxxxxxx
+                x
+            x
+
             xxxx xxxxxxx x
                 xxxxxx xxxxxx x
                     xxxx xxxxx   xxxxxxx x xxxxxxx   xxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index f9368b57e7..114f485923 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -99,6 +99,7 @@ class Values<R extends Record> extends AbstractTable<R> {
             // for those dialects that do not support a VALUES() constructor
             /* [pro] xx
             xxxx xxxxxxx
+            xxxx xxxxx
             xxxx xxxxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx