diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java
index ff9ff0cac4..3a4a515d69 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKey.java
@@ -40,6 +40,8 @@ package org.jooq.impl;
 import java.util.Arrays;
 import java.util.List;
 
+import org.jooq.Constraint;
+import org.jooq.ConstraintEnforcementStep;
 import org.jooq.Context;
 import org.jooq.Key;
 import org.jooq.Record;
@@ -94,6 +96,22 @@ abstract class AbstractKey<R extends Record> extends AbstractNamed implements Ke
         return enforced;
     }
 
+    private final Constraint enforced(ConstraintEnforcementStep key) {
+
+
+
+
+
+        return key;
+    }
+
+    @Override
+    public final Constraint constraint() {
+        return enforced(constraint0());
+    }
+
+    abstract ConstraintEnforcementStep constraint0();
+
     @Override
     public final void accept(Context<?> ctx) {
         ctx.visit(getUnqualifiedName());
diff --git a/jOOQ/src/main/java/org/jooq/impl/CheckImpl.java b/jOOQ/src/main/java/org/jooq/impl/CheckImpl.java
index 5a57e9c66b..a7011a5118 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CheckImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CheckImpl.java
@@ -40,6 +40,7 @@ package org.jooq.impl;
 import org.jooq.Check;
 import org.jooq.Condition;
 import org.jooq.Constraint;
+import org.jooq.ConstraintEnforcementStep;
 import org.jooq.Context;
 import org.jooq.Name;
 import org.jooq.Record;
@@ -82,13 +83,22 @@ final class CheckImpl<R extends Record> extends AbstractNamed implements Check<R
     }
 
     @Override
-    public final Constraint constraint() {
-        return DSL.constraint(getName()).check(condition);
+    public final boolean enforced() {
+        return enforced;
+    }
+
+    private final Constraint enforced(ConstraintEnforcementStep key) {
+
+
+
+
+
+        return key;
     }
 
     @Override
-    public final boolean enforced() {
-        return enforced;
+    public final Constraint constraint() {
+        return enforced(DSL.constraint(getName()).check(condition));
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java
index 4d0b13ae38..db8efa647f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Diff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java
@@ -655,6 +655,19 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 2fc3c119f0..75ff86bec0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -3703,9 +3703,16 @@ final class ParserImpl implements Parser {
 
     private static final Constraint parseConstraintEnforcementIf(ParserContext ctx, ConstraintEnforcementStep e) {
         if ((parseKeywordIf(ctx, "ENABLE") || parseKeywordIf(ctx, "ENFORCED")) && ctx.requireProEdition())
-            return e.enforced();
+
+
+
+            ;
         else if ((parseKeywordIf(ctx, "DISABLE") || parseKeywordIf(ctx, "NOT ENFORCED")) && ctx.requireProEdition())
-            return e.notEnforced();
+
+
+
+            ;
+
         else return e;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
index 02f1e17a5d..7844fd9832 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
@@ -46,7 +46,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.jooq.Constraint;
+import org.jooq.ConstraintEnforcementStep;
 import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -194,7 +194,7 @@ final class ReferenceImpl<R extends Record, O extends Record> extends AbstractKe
     }
 
     @Override
-    public Constraint constraint() {
+    final ConstraintEnforcementStep constraint0() {
         return DSL.constraint(getName())
                   .foreignKey(getFieldsArray())
                   .references(key.getTable(), key.getFieldsArray());
diff --git a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
index 5408268c23..97fd753951 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.jooq.Constraint;
+import org.jooq.ConstraintEnforcementStep;
 import org.jooq.ForeignKey;
 import org.jooq.Record;
 import org.jooq.Table;
@@ -81,7 +81,7 @@ final class UniqueKeyImpl<R extends Record> extends AbstractKey<R> implements Un
     }
 
     @Override
-    public Constraint constraint() {
+    final ConstraintEnforcementStep constraint0() {
         if (isPrimary())
             return DSL.constraint(getName()).primaryKey(getFieldsArray());
         else