From 28574d8034d7bb3cbf71ebd2dc8393a3164f38f8 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 5 May 2020 11:44:21 +0200
Subject: [PATCH] [jOOQ/jOOQ#10045] Added some forgotten deprecations

---
 jOOQ/src/main/java/org/jooq/DSLContext.java | 4 ++++
 jOOQ/src/main/java/org/jooq/impl/DSL.java   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index a59b11bab0..abd2815c20 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -8150,7 +8150,9 @@ public interface DSLContext extends Scope , AutoCloseable {
      * <td>See {@link #mergeInto(Table)} for the standard MERGE statement</td>
      * </tr>
      * </table>
+     * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)}
      */
+    @Deprecated
     @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     <R extends Record> MergeKeyStepN<R> mergeInto(Table<R> table, Field<?>... fields);
 
@@ -8158,7 +8160,9 @@ public interface DSLContext extends Scope , AutoCloseable {
      * Create a new DSL merge statement (H2-specific syntax).
      *
      * @see #mergeInto(Table, Field...)
+     * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)}
      */
+    @Deprecated
     @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     <R extends Record> MergeKeyStepN<R> mergeInto(Table<R> table, Collection<? extends Field<?>> fields);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index db23360bd7..d64579fdb9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -5939,7 +5939,9 @@ public class DSL {
      * </table>
      *
      * @see DSLContext#mergeInto(Table, Field...)
+     * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)}
      */
+    @Deprecated
     @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     public static <R extends Record> MergeKeyStepN<R> mergeInto(Table<R> table, Field<?>... fields) {
         return dsl().mergeInto(table, fields);
@@ -5953,7 +5955,9 @@ public class DSL {
      * <code>MERGE</code> statement.
      *
      * @see DSLContext#mergeInto(Table, Collection)
+     * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)}
      */
+    @Deprecated
     @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     public static <R extends Record> MergeKeyStepN<R> mergeInto(Table<R> table, Collection<? extends Field<?>> fields) {
         return dsl().mergeInto(table, fields);