diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractElementContainerDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractElementContainerDefinition.java
index ac62315505..862996ddc0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractElementContainerDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractElementContainerDefinition.java
@@ -148,6 +148,10 @@ extends AbstractDefinition {
         return 0;
     }
 
+    protected String parseTypeName(String typeName) {
+        return typeName.replace(" NOT NULL", "");
+    }
+
     protected boolean parseNotNull(String typeName) {
         return typeName.toUpperCase().contains("NOT NULL");
     }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java
index 28ea437e77..7f023a22e3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java
@@ -93,7 +93,7 @@ public class DerbyTableDefinition extends AbstractTableDefinition {
             DataTypeDefinition type = new DefaultDataTypeDefinition(
                 getDatabase(),
                 getSchema(),
-                typeName,
+                parseTypeName(typeName),
                 precision,
                 precision,
                 scale,