From 090df451e435e2e5413f6878ac356da8f64023b1 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Sat, 15 Apr 2017 22:07:37 +0200
Subject: [PATCH] [#6082] DSL.condition(Field) and field(Condition) should
 unwrap previously wrapped QueryPart

---
 jOOQ/src/main/java/org/jooq/impl/DSL.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index d4d77267b1..0d8a24265a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -9280,7 +9280,9 @@ public class DSL {
      */
     @Support
     public static Condition condition(Field<Boolean> field) {
-        return new FieldCondition(field);
+        return field instanceof ConditionAsField
+            ? ((ConditionAsField) field).condition
+            : new FieldCondition(field);
     }
 
     /**
@@ -9461,7 +9463,9 @@ public class DSL {
      */
     @Support
     public static Field<Boolean> field(Condition condition) {
-        return new ConditionAsField(condition);
+        return condition instanceof FieldCondition
+            ? ((FieldCondition) condition).field
+            : new ConditionAsField(condition);
     }
 
     // -------------------------------------------------------------------------