From 0ac440f83eb42054824672c04dea1db0b0eb64bf Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 8 Apr 2020 17:16:14 +0200 Subject: [PATCH] [jOOQ/jOOQ#7291] Remove Pro only code --- jOOQ/src/main/java/org/jooq/impl/MergeImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 470f68af65..7d65bbf7d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -245,7 +245,10 @@ implements */ private static final long serialVersionUID = -8835479296876774391L; private static final Clause[] CLAUSES = { MERGE }; - private static final Set NO_SUPPORT_AND = SQLDialect.supportedBy(); + + + + private static final Set NO_SUPPORT_MULTI = SQLDialect.supportedBy(HSQLDB); private static final Set REQUIRE_NEGATION = SQLDialect.supportedBy(H2); @@ -1691,7 +1694,9 @@ implements .visit(K_NOT).sql(' ') .visit(K_MATCHED).sql(' '); - if (!(m.condition instanceof NoCondition) && !NO_SUPPORT_AND.contains(ctx.dialect())) + + + ctx.visit(K_AND).sql(' ').visit(m.condition).sql(' '); ctx.visit(K_THEN).sql(' ') @@ -1703,8 +1708,10 @@ implements m.insertMap.toSQL92Values(ctx); ctx.end(MERGE_VALUES); - if (!(m.condition instanceof NoCondition) && NO_SUPPORT_AND.contains(ctx.dialect())) - ctx.sql(' ').visit(K_WHERE).sql(' ').visit(m.condition); + + + + } ctx.end(MERGE_WHEN_NOT_MATCHED_THEN_INSERT);