From a1d3d20d0c54eb87d6e90d1556c2ca4950baa9f7 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 14 Jul 2020 16:19:37 +0200
Subject: [PATCH] [jOOQ/jOOQ#10386] Updated Javadoc to refer to new Settings

---
 jOOQ/src/main/java/org/jooq/TableRecord.java     |  4 +++-
 jOOQ/src/main/java/org/jooq/UpdatableRecord.java | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/TableRecord.java b/jOOQ/src/main/java/org/jooq/TableRecord.java
index e4b612f12c..0e3ddc5ec8 100644
--- a/jOOQ/src/main/java/org/jooq/TableRecord.java
+++ b/jOOQ/src/main/java/org/jooq/TableRecord.java
@@ -39,6 +39,7 @@ package org.jooq;
 
 import java.util.Collection;
 
+import org.jooq.conf.Settings;
 import org.jooq.exception.DataAccessException;
 
 import org.jetbrains.annotations.NotNull;
@@ -69,7 +70,8 @@ public interface TableRecord<R extends TableRecord<R>> extends Record {
      * If you want to enforce statement execution, regardless if the values in
      * this record were changed, you can explicitly set the changed flags for
      * all values with {@link #changed(boolean)} or for single values with
-     * {@link #changed(Field, boolean)}, prior to insertion.
+     * {@link #changed(Field, boolean)}, prior to insertion, or alternatively,
+     * use {@link Settings#isInsertUnchangedRecords()}.
      *
      * @return <code>1</code> if the record was stored to the database. <code>0
      *         </code> if storing was not necessary.
diff --git a/jOOQ/src/main/java/org/jooq/UpdatableRecord.java b/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
index 7a4edd7cff..b9c789ac0e 100644
--- a/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
+++ b/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
@@ -88,6 +88,8 @@ import org.jetbrains.annotations.Nullable;
  * the first time)</li>
  * <li>{@link #store()} : Storing the record to the database. This executes
  * either an <code>INSERT</code> or an <code>UPDATE</code> statement</li>
+ * <li>{@link #merge()} : Merging a record to the database. This executes an
+ * <code>INSERT .. ON DUPLICATE KEY UPDATE</code> statement.</li>
  * </ul>
  * <p>
  * <code>UpdatableRecords</code> are {@link Attachable}, which means that they
@@ -227,7 +229,9 @@ public interface UpdatableRecord<R extends UpdatableRecord<R>> extends TableReco
      * If you want to enforce statement execution, regardless if the values in
      * this record were changed, you can explicitly set the changed flags for
      * all values with {@link #changed(boolean)} or for single values with
-     * {@link #changed(Field, boolean)}, prior to storing.
+     * {@link #changed(Field, boolean)}, prior to storing, or alternatively, use
+     * {@link Settings#getUpdateUnchangedRecords()} and/or
+     * {@link Settings#isInsertUnchangedRecords()}.
      * <p>
      * This is the same as calling <code>record.store(record.fields())</code>
      *
@@ -282,7 +286,8 @@ public interface UpdatableRecord<R extends UpdatableRecord<R>> extends TableReco
      * If you want to enforce statement execution, regardless if the values in
      * this record were changed, you can explicitly set the changed flags for
      * all values with {@link #changed(boolean)} or for single values with
-     * {@link #changed(Field, boolean)}, prior to insertion.
+     * {@link #changed(Field, boolean)}, prior to insertion, or alternatively,
+     * use {@link Settings#isInsertUnchangedRecords()}.
      * <p>
      * This is the same as calling <code>record.insert(record.fields())</code>
      *
@@ -331,7 +336,8 @@ public interface UpdatableRecord<R extends UpdatableRecord<R>> extends TableReco
      * If you want to enforce statement execution, regardless if the values in
      * this record were changed, you can explicitly set the changed flags for
      * all values with {@link #changed(boolean)} or for single values with
-     * {@link #changed(Field, boolean)}, prior to updating.
+     * {@link #changed(Field, boolean)}, prior to updating, or alternatively,
+     * use {@link Settings#getUpdateUnchangedRecords()}.
      * <p>
      * This is the same as calling <code>record.update(record.fields())</code>
      *
@@ -391,7 +397,9 @@ public interface UpdatableRecord<R extends UpdatableRecord<R>> extends TableReco
      * If you want to enforce statement execution, regardless if the values in
      * this record were changed, you can explicitly set the changed flags for
      * all values with {@link #changed(boolean)} or for single values with
-     * {@link #changed(Field, boolean)}, prior to insertion.
+     * {@link #changed(Field, boolean)}, prior to insertion, or alternatively,
+     * use {@link Settings#getUpdateUnchangedRecords()} and/or
+     * {@link Settings#isInsertUnchangedRecords()}..
      * <p>
      * This is the same as calling <code>record.merge(record.fields())</code>
      *