diff --git a/jOOQ/src/main/java/org/jooq/Case.java b/jOOQ/src/main/java/org/jooq/Case.java
index d4cb8a8a99..67d4ddd755 100644
--- a/jOOQ/src/main/java/org/jooq/Case.java
+++ b/jOOQ/src/main/java/org/jooq/Case.java
@@ -37,11 +37,10 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 import org.jooq.impl.DSL;
 
+import org.jetbrains.annotations.NotNull;
+
 
 /**
  * The SQL case statement.
@@ -145,4 +144,55 @@ public interface Case {
     @NotNull
     @Support
     <T> CaseConditionStep<T> when(Condition condition, Select<? extends Record1<T>> result);
+
+    /**
+     * This construct can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     *
+     * @param <T> The generic field type parameter
+     * @param condition A condition to check in the case statement
+     * @param result The result if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    <T> CaseConditionStep<T> when(Field<Boolean> condition, T result);
+
+    /**
+     * This construct can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     *
+     * @param <T> The generic field type parameter
+     * @param condition A condition to check in the case statement
+     * @param result The result if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    <T> CaseConditionStep<T> when(Field<Boolean> condition, Field<T> result);
+
+    /**
+     * This construct can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     *
+     * @param <T> The generic field type parameter
+     * @param condition A condition to check in the case statement
+     * @param result The result if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    <T> CaseConditionStep<T> when(Field<Boolean> condition, Select<? extends Record1<T>> result);
 }
diff --git a/jOOQ/src/main/java/org/jooq/CaseConditionStep.java b/jOOQ/src/main/java/org/jooq/CaseConditionStep.java
index 63e901f4ee..f8557385ff 100644
--- a/jOOQ/src/main/java/org/jooq/CaseConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/CaseConditionStep.java
@@ -37,7 +37,7 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.NotNull;
 
 
 /**
@@ -90,6 +90,42 @@ public interface CaseConditionStep<T> extends Field<T> {
     @Support
     CaseConditionStep<T> when(Condition condition, Select<? extends Record1<T>> result);
 
+    /**
+     * Compare a condition to the already constructed case statement, return
+     * result if the condition holds true
+     *
+     * @param condition The condition to add to the case statement
+     * @param result The result value if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    CaseConditionStep<T> when(Field<Boolean> condition, T result);
+
+    /**
+     * Compare a condition to the already constructed case statement, return
+     * result if the condition holds true
+     *
+     * @param condition The condition to add to the case statement
+     * @param result The result value if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    CaseConditionStep<T> when(Field<Boolean> condition, Field<T> result);
+
+    /**
+     * Compare a condition to the already constructed case statement, return
+     * result if the condition holds true
+     *
+     * @param condition The condition to add to the case statement
+     * @param result The result value if the condition holds true
+     * @return An intermediary step for case statement construction
+     */
+    @NotNull
+    @Support
+    CaseConditionStep<T> when(Field<Boolean> condition, Select<? extends Record1<T>> result);
+
     /**
      * Add an else clause to the already constructed case statement
      *
diff --git a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
index cb43cae8ac..131f673a9c 100644
--- a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
+++ b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
@@ -37,7 +37,13 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
index 6362c4024f..19c66f5913 100644
--- a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
+++ b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
@@ -37,7 +37,13 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
index 587144478a..9117025510 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
@@ -98,6 +98,21 @@ final class CaseConditionStepImpl<T> extends AbstractField<T> implements CaseCon
         return when(condition, DSL.field(result));
     }
 
+    @Override
+    public final CaseConditionStep<T> when(Field<Boolean> condition, T result) {
+        return when(DSL.condition(condition), result);
+    }
+
+    @Override
+    public final CaseConditionStep<T> when(Field<Boolean> condition, Field<T> result) {
+        return when(DSL.condition(condition), result);
+    }
+
+    @Override
+    public final CaseConditionStep<T> when(Field<Boolean> condition, Select<? extends Record1<T>> result) {
+        return when(DSL.condition(condition), result);
+    }
+
     @Override
     public final Field<T> otherwise(T result) {
         return else_(result);
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
index e7fcc49932..6077d24481 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
@@ -77,4 +77,19 @@ final class CaseImpl implements Case {
     public final <T> CaseConditionStep<T> when(Condition condition, Select<? extends Record1<T>> result) {
         return when(condition, DSL.field(result));
     }
+
+    @Override
+    public final <T> CaseConditionStep<T> when(Field<Boolean> condition, T result) {
+        return when(DSL.condition(condition), result);
+    }
+
+    @Override
+    public final <T> CaseConditionStep<T> when(Field<Boolean> condition, Field<T> result) {
+        return when(DSL.condition(condition), result);
+    }
+
+    @Override
+    public final <T> CaseConditionStep<T> when(Field<Boolean> condition, Select<? extends Record1<T>> result) {
+        return when(DSL.condition(condition), result);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Continue.java b/jOOQ/src/main/java/org/jooq/impl/Continue.java
index b0f89de406..3e4b1a69bb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Continue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Continue.java
@@ -125,6 +125,12 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 44227757ef..2254126777 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -11896,6 +11896,30 @@ public class DSL {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -14106,6 +14130,54 @@ public class DSL {
         return decode().when(condition, result);
     }
 
+    /**
+     * Initialise a {@link Case} statement.
+     * <p>
+     * This API can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     */
+    @NotNull
+    @Support
+    public static <T> CaseConditionStep<T> when(Field<Boolean> condition, T result) {
+        return decode().when(condition, result);
+    }
+
+    /**
+     * Initialise a {@link Case} statement.
+     * <p>
+     * This API can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     */
+    @NotNull
+    @Support
+    public static <T> CaseConditionStep<T> when(Field<Boolean> condition, Field<T> result) {
+        return decode().when(condition, result);
+    }
+
+    /**
+     * Initialise a {@link Case} statement.
+     * <p>
+     * This API can be used to create expressions of the type <code><pre>
+     * CASE WHEN x &lt; 1  THEN 'one'
+     *      WHEN x &gt;= 2 THEN 'two'
+     *      ELSE            'three'
+     * END
+     * </pre></code>
+     */
+    @NotNull
+    @Support
+    public static <T> CaseConditionStep<T> when(Field<Boolean> condition, Select<? extends Record1<T>> result) {
+        return decode().when(condition, result);
+    }
+
     /**
      * Initialise a {@link Case} statement.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exit.java b/jOOQ/src/main/java/org/jooq/impl/Exit.java
index 01c6eb9677..851a59738d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exit.java
@@ -127,6 +127,12 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+