From 3dc1c751884ba8665f732e1ce3616f2e33866166 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 11 Jun 2018 09:58:00 +0200 Subject: [PATCH] [#7562] Incomplete Support annotation on some of the H2 style mergeInto overloads --- jOOQ/src/main/java/org/jooq/DSLContext.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/DSL.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index bbf8818678..d09c780493 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -7994,7 +7994,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStepN mergeInto(Table table, Field... fields); /** @@ -8002,7 +8002,7 @@ public interface DSLContext extends Scope , AutoCloseable { * * @see #mergeInto(Table, Field...) */ - @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) MergeKeyStepN mergeInto(Table table, Collection> fields); /** diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 455826b40b..0c97f3ad4a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -5848,7 +5848,7 @@ public class DSL { * * @see DSLContext#mergeInto(Table, Field...) */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStepN mergeInto(Table table, Field... fields) { return dsl().mergeInto(table, fields); } @@ -5862,7 +5862,7 @@ public class DSL { * * @see DSLContext#mergeInto(Table, Collection) */ - @Support({ CUBRID, H2, HSQLDB }) + @Support({ CUBRID, FIREBIRD_3_0, H2, HSQLDB, MARIADB, MYSQL, POSTGRES_9_5 }) public static MergeKeyStepN mergeInto(Table table, Collection> fields) { return dsl().mergeInto(table, fields); }