From e80491b6524dcd6cfa9039d209f70e40814dd14b Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 9 Apr 2020 09:48:59 +0200
Subject: [PATCH] [jOOQ/jOOQ#7291] Fixed OSS edition

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

diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 59ae9a0e30..1a4e5ef9cc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -1616,7 +1616,7 @@ implements
 
             for (MatchedClause m : matched) {
                 if (m.delete) {
-                    if (emulate |= matchDelete )
+                    if (emulate |= matchDelete)
                         break emulateCheck;
 
                     matchDelete = true;
@@ -1738,7 +1738,7 @@ implements
         MatchedClause m = update != null ? update : delete;
 
         // [#7291] Standard SQL AND clause in updates
-        if ((requireMatchedConditions || !(m.condition instanceof NoCondition)) && !NO_SUPPORT_AND.contains(ctx.dialect()))
+        if ((requireMatchedConditions || !(m.condition instanceof NoCondition)))
             ctx.sql(' ').visit(K_AND).sql(' ').visit(m.condition);
 
         ctx.sql(' ').visit(K_THEN);