diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/clickhouse/ClickHouseDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/clickhouse/ClickHouseDatabase.java
index 2214d75169..d078b539a1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/clickhouse/ClickHouseDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/clickhouse/ClickHouseDatabase.java
@@ -76,6 +76,7 @@ import org.jooq.SortOrder;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.TableOptions.TableType;
+import org.jooq.conf.RenderOptionalKeyword;
 import org.jooq.impl.DSL;
 import org.jooq.meta.AbstractDatabase;
 import org.jooq.meta.AbstractIndexDefinition;
@@ -205,7 +206,7 @@ public class ClickHouseDatabase extends AbstractDatabase implements ResultQueryD
 
         return
         create().select(
-                    t.DATABASE,
+                    t.DATABASE.as("catalog"),
                     t.DATABASE,
                     t.NAME,
                     inline("KEY_").concat(t.NAME).concat(inline("_PRIMARY")).as("constraint_name"),
@@ -403,7 +404,11 @@ public class ClickHouseDatabase extends AbstractDatabase implements ResultQueryD
 
     @Override
     protected DSLContext create0() {
-        return DSL.using(getConnection(), SQLDialect.CLICKHOUSE);
+        return DSL
+            .using(getConnection(), SQLDialect.CLICKHOUSE)
+            .configuration()
+            .deriveSettings(s -> s.withRenderOptionalAsKeywordForFieldAliases(RenderOptionalKeyword.ON))
+            .dsl();
     }
 
     @Override