From 39935d18c80b6433a9f5b018cffb79f79c320e29 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 11 Jan 2023 16:50:20 +0100 Subject: [PATCH] [jOOQ/jOOQ#9085] SQLDialect.DEFAULT should render RETURNING clause --- .../main/java/org/jooq/impl/AbstractDMLQuery.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 99c37371a8..a3a3fcf9af 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -41,7 +41,7 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; // ... // ... -// ... +import static org.jooq.SQLDialect.*; // ... // ... // ... @@ -180,9 +180,9 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery private static final JooqLogger log = JooqLogger.getLogger(AbstractQuery.class); private static final Set NO_SUPPORT_INSERT_ALIASED_TABLE = SQLDialect.supportedBy(DERBY, FIREBIRD, H2, MARIADB, MYSQL); - private static final Set NATIVE_SUPPORT_INSERT_RETURNING = SQLDialect.supportedBy(FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB); - private static final Set NATIVE_SUPPORT_UPDATE_RETURNING = SQLDialect.supportedBy(FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB); - private static final Set NATIVE_SUPPORT_DELETE_RETURNING = SQLDialect.supportedBy(FIREBIRD, MARIADB, POSTGRES, YUGABYTEDB); + private static final Set NO_NATIVE_SUPPORT_INSERT_RETURNING = SQLDialect.supportedBy(CUBRID, DERBY, H2, HSQLDB, IGNITE, MYSQL, SQLITE); + private static final Set NO_NATIVE_SUPPORT_UPDATE_RETURNING = SQLDialect.supportedBy(CUBRID, DERBY, H2, HSQLDB, IGNITE, MYSQL, SQLITE); + private static final Set NO_NATIVE_SUPPORT_DELETE_RETURNING = SQLDialect.supportedBy(CUBRID, DERBY, H2, HSQLDB, IGNITE, MYSQL, SQLITE); private static final Set NATIVE_SUPPORT_DATA_CHANGE_DELTA_TABLE = SQLDialect.supportedBy(H2); private static final Set NO_SUPPORT_FETCHING_KEYS = SQLDialect.supportedBy(IGNITE); private static final Set NO_SUPPORT_RETURNING_ASTERISK = SQLDialect.supportedUntil(MARIADB); @@ -898,9 +898,9 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery } final boolean nativeSupportReturning(Scope ctx) { - return this instanceof Insert && NATIVE_SUPPORT_INSERT_RETURNING.contains(ctx.dialect()) - || this instanceof Update && NATIVE_SUPPORT_UPDATE_RETURNING.contains(ctx.dialect()) - || this instanceof Delete && NATIVE_SUPPORT_DELETE_RETURNING.contains(ctx.dialect()); + return this instanceof Insert && !NO_NATIVE_SUPPORT_INSERT_RETURNING.contains(ctx.dialect()) + || this instanceof Update && !NO_NATIVE_SUPPORT_UPDATE_RETURNING.contains(ctx.dialect()) + || this instanceof Delete && !NO_NATIVE_SUPPORT_DELETE_RETURNING.contains(ctx.dialect()); } final boolean nativeSupportReturningOrDataChangeDeltaTable(Scope ctx) {