diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
index 1eaa886a6e..af417d8e5b 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
@@ -119,8 +119,13 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
             return "IDENTITY_" + getJavaIdentifier(((IdentityDefinition) definition).getColumn().getContainer());
         }
 
+        // [#2032] Intercept default Catalog
+        else if (definition instanceof CatalogDefinition && ((CatalogDefinition) definition).isDefaultCatalog()) {
+            return "DEFAULT_CATALOG";
+        }
+
         // [#2089] Intercept default schema
-        if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
+        else if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
             return "DEFAULT_SCHEMA";
         }
 
@@ -287,12 +292,17 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
     public String getJavaClassName(Definition definition, Mode mode) {
 
         // [#1150] Intercept Mode.RECORD calls for tables
-        if (!generator.generateRecords() && mode == Mode.RECORD && definition instanceof TableDefinition) {
+        if (definition instanceof TableDefinition && !generator.generateRecords() && mode == Mode.RECORD) {
             return Record.class.getSimpleName();
         }
 
+        // [#2032] Intercept default catalog
+        else if (definition instanceof CatalogDefinition && ((CatalogDefinition) definition).isDefaultCatalog()) {
+            return "DefaultCatalog";
+        }
+
         // [#2089] Intercept default schema
-        if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
+        else if (definition instanceof SchemaDefinition && ((SchemaDefinition) definition).isDefaultSchema()) {
             return "DefaultSchema";
         }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
index 25febff820..a3e6524dd2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
@@ -141,9 +141,10 @@ public abstract class AbstractDefinition implements Definition {
 
             String separator = "";
             for (Definition part : getDefinitionPath()) {
-                if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema()) {
+                if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
+                    continue;
+                else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
                     continue;
-                }
 
                 sb.append(separator);
                 sb.append(part.getInputName());
@@ -169,9 +170,10 @@ public abstract class AbstractDefinition implements Definition {
 
             String separator = "";
             for (Definition part : getDefinitionPath()) {
-                if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema()) {
+                if (part instanceof CatalogDefinition && ((CatalogDefinition) part).isDefaultCatalog())
+                    continue;
+                else if (part instanceof SchemaDefinition && ((SchemaDefinition) part).isDefaultSchema())
                     continue;
-                }
 
                 sb.append(separator);
                 sb.append(part.getOutputName());