postgres.git / summary / log / commit / refs
commit 3d895bc846f25859bd6dd242fbf204e6c5166e6f
Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Fri Aug 12 11:16:50 2022 +0000
First released in: 16.0, 15.0
MERGE docs adjustments
Per Justin Pryzby
Discussion: https://postgr.es/m/20220801145257.GA15006@telsasoft.com
Discussion: https://postgr.es/m/20220714162618.GH18011@telsasoft.com
doc/src/sgml/mvcc.sgml | 3 ++-
doc/src/sgml/ref/merge.sgml | 10 +++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index 14b51db55e3..337f6dd4294 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -402,7 +402,8 @@
and a unique index is present and a duplicate row is concurrently
inserted, then a uniqueness violation error is raised;
<command>MERGE</command> does not attempt to avoid such
- errors by evaluating <literal>MATCHED</literal> conditions.
+ errors by restarting evaluation of <literal>MATCHED</literal>
+ conditions.
</para>
<para>
diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml
index 7f73f3d89c5..a129a6edd5b 100644
--- a/doc/src/sgml/ref/merge.sgml
+++ b/doc/src/sgml/ref/merge.sgml
@@ -266,10 +266,6 @@ DELETE
filled with a default value, either its declared default value
or null if there is none.
</para>
- <para>
- If the expression for any column is not of the correct data type,
- automatic type conversion will be attempted.
- </para>
<para>
If <replaceable class="parameter">target_table_name</replaceable>
is a partitioned table, each row is routed to the appropriate partition
@@ -581,12 +577,12 @@ WHEN NOT MATCHED THEN
<programlisting>
MERGE INTO CustomerAccount CA
USING (Select CustomerId, TransactionValue From RecentTransactions) AS T
-ON CA.CustomerId = T.CustomerId
+ON T.CustomerId = CA.CustomerId
+WHEN MATCHED THEN
+ UPDATE SET Balance = Balance + TransactionValue;
WHEN NOT MATCHED THEN
INSERT (CustomerId, Balance)
VALUES (T.CustomerId, T.TransactionValue)
-WHEN MATCHED THEN
- UPDATE SET Balance = Balance + TransactionValue;
</programlisting>
</para>
[parent: 92af9143f13d]