diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 772d571510..a82e9d1102 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -669,7 +669,7 @@ public class JavaGenerator extends AbstractGenerator {
             final String type = getJavaType(column.getType());
             final String typeInterface = getJavaType(column.getType(), Mode.INTERFACE);
             final String name = column.getQualifiedOutputName();
-            final boolean isUDT = database.getUDT(column.getSchema(), column.getType().getUserType()) != null;
+            final boolean isUDT = column.getType().isUDT();
 
             out.tab(1).javadoc("Setter for <code>%s</code>.%s", name, defaultIfBlank(" " + comment, ""));
             out.tab(1).overrideIf(generateInterfaces() && !generateImmutablePojos() && !isUDT);
@@ -1811,7 +1811,7 @@ public class JavaGenerator extends AbstractGenerator {
             final String columnSetter = getStrategy().getJavaSetterName(column, Mode.POJO);
             final String columnGetter = getStrategy().getJavaGetterName(column, Mode.POJO);
             final String columnMember = getStrategy().getJavaMemberName(column, Mode.POJO);
-            final boolean isUDT = database.getUDT(column.getSchema(), column.getType().getUserType()) != null;
+            final boolean isUDT = column.getType().isUDT();
 
             // Getter
             out.println();
@@ -2815,7 +2815,7 @@ public class JavaGenerator extends AbstractGenerator {
 
             final String getter = getStrategy().getJavaGetterName(parameter, Mode.DEFAULT);
             final String columnTypeInterface = getJavaType(parameter.getType(), Mode.INTERFACE);
-            final boolean isUDT = database.getUDT(parameter.getSchema(), parameter.getType().getUserType()) != null;
+            final boolean isUDT = parameter.getType().isUDT();
 
             if (instance) {
 
diff --git a/jOOQ-test/src/test/java/org/jooq/test/OracleTest.java b/jOOQ-test/src/test/java/org/jooq/test/OracleTest.java
index 8cf23e2dd1..ba7efd5619 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/OracleTest.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/OracleTest.java
@@ -129,6 +129,7 @@ xxxxxx xxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxx
+xxxxxx xxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxx
@@ -147,11 +148,15 @@ xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -1742,6 +1747,44 @@ xxxxxx xxxxx xxxxxxxxxx xxxxxxx xxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
     x
+
+    xxxxx
+    xxxxxx xxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+
+        xxxxxxxxxxxxx xxxx x xxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xx xxxxxxxxxx xxxxxxxxx xxxxxx
+        xx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxx xx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxx xx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxx xx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxx xx x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xx xx xxx
+        xxxxxxxx
+            xxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxx xxxxxx x
+        xxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxx
+
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        xxxxxxxxxxxxxxxxxxxxxx xx xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    x
 x
 
 xx [/pro] */
\ No newline at end of file