diff --git a/jOOQ/src/main/java/org/jooq/impl/Collated.java b/jOOQ/src/main/java/org/jooq/impl/Collated.java
index 4e2b813f92..f5db1967b1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Collated.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Collated.java
@@ -37,17 +37,16 @@
  */
 package org.jooq.impl;
 
+// ...
+import static org.jooq.impl.DSL.collation;
+import static org.jooq.impl.DSL.unquotedName;
 import static org.jooq.impl.Keywords.K_COLLATE;
 
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
-
 import org.jooq.Binding;
 import org.jooq.Collation;
 import org.jooq.Context;
 import org.jooq.DataType;
 import org.jooq.Field;
-import org.jooq.Function1;
 import org.jooq.QueryPart;
 // ...
 // ...
@@ -57,8 +56,8 @@ import org.jooq.QueryPart;
  */
 final class Collated extends AbstractField<String> implements QOM.Collated {
 
-    private final Field<?>  field;
-    private final Collation collation;
+    final Field<?>  field;
+    final Collation collation;
 
     Collated(Field<?> field, Collation collation) {
         super(field.getQualifiedName(), type(field).collation(collation), field.getCommentPart(), binding(field));
@@ -81,10 +80,16 @@ final class Collated extends AbstractField<String> implements QOM.Collated {
     public final void accept(Context<?> ctx) {
 
         // [#8011] Collations are vendor-specific storage clauses, which we might need to ignore
-        if (ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") == null)
-            ctx.sql("((").visit(field).sql(") ").visit(K_COLLATE).sql(' ').visit(collation).sql(')');
-        else
+        if (ctx.configuration().data("org.jooq.ddl.ignore-storage-clauses") != null)
             ctx.visit(field);
+
+
+
+
+
+
+        else
+            ctx.sql("((").visit(field).sql(") ").visit(K_COLLATE).sql(' ').visit(collation).sql(')');
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 80743fe539..53855263cb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -12150,7 +12150,7 @@ public class DSL {
      * Create a collation by its unqualified name.
      */
     @NotNull
-    @Support({ HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     public static Collation collation(String collation) {
         return collation(name(collation));
     }
@@ -12159,7 +12159,7 @@ public class DSL {
      * Create a collation by its qualified name.
      */
     @NotNull
-    @Support({ HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    @Support({ HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     public static Collation collation(Name collation) {
         return new CollationImpl(collation);
     }