From 91b257f3b2bac276218c7d39ff7bb7846c0fb62c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 12 Mar 2020 17:22:40 +0100 Subject: [PATCH] [jOOQ/jOOQ#9954] Incorrect SQL generated in DB2's INSERT INTO t .. RETURNING t.* emulation --- jOOQ/src/main/java/org/jooq/ContinueWhenStep.java | 1 - .../impl/{FinalTable.java => DataChangeDeltaTable.java} | 0 jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 8 +------- 3 files changed, 1 insertion(+), 8 deletions(-) rename jOOQ/src/main/java/org/jooq/impl/{FinalTable.java => DataChangeDeltaTable.java} (100%) diff --git a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java index 7f88615c3c..23effd56ba 100644 --- a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java +++ b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java @@ -63,6 +63,5 @@ package org.jooq; - diff --git a/jOOQ/src/main/java/org/jooq/impl/FinalTable.java b/jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java similarity index 100% rename from jOOQ/src/main/java/org/jooq/impl/FinalTable.java rename to jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index d967e4b8a5..10b8a87b56 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -1392,13 +1392,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp // [#....] Some SQL dialects do not require a FROM clause. Others do and // jOOQ generates a "DUAL" table or something equivalent. // See also org.jooq.impl.Dual for details. - boolean hasFrom = !getFrom().isEmpty() - - - - || REQUIRES_FROM_CLAUSE.contains(context.dialect()) - ; - + boolean hasFrom = !getFrom().isEmpty() || REQUIRES_FROM_CLAUSE.contains(context.dialect()); List semiAntiJoinPredicates = null; ConditionProviderImpl where = getWhere();