From 9e1a69ab54d7313338bdbb09489bb83e1849ca88 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 11 Jun 2019 11:58:23 +0200 Subject: [PATCH] [jOOQ/jOOQ#8766] Add missing dialects to @Support of mergeInto() Adds AURORA_POSTGRES, HANA, and POSTGRES_9_5 to @Support annotation of DSLContext#mergeInto(Table) and DSL#mergeInto(Table). --- jOOQ/src/main/java/org/jooq/DSLContext.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DSL.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 9e48226aa6..67f6de2b38 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -7651,7 +7651,7 @@ public interface DSLContext extends Scope , AutoCloseable { * statement without field specification. See also * {@link #mergeInto(Table, Field...)} */ - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL }) + @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeUsingStep mergeInto(Table table); // [jooq-tools] START [merge] diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 5a2fd96178..5c2ad519a5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -5425,7 +5425,7 @@ public class DSL { * * @see DSLContext#mergeInto(Table) */ - @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL }) + @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeUsingStep mergeInto(Table table) { return dsl().mergeInto(table); }