From 2b18743614bb526e5a49a542c9c80c96668639cd Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 15 Feb 2017 15:41:09 -0500
Subject: [PATCH] Doc: fix syntax synopsis for INSERT ... ON CONFLICT DO
UPDATE.
Commit 906bfcad7 adjusted the syntax synopsis for UPDATE, but missed
the fact that the INSERT synopsis now contains a duplicate of that.
In passing, improve wording and markup about using a table alias to
dodge the conflict with use of "excluded" as a special table name.
---
doc/src/sgml/ref/insert.sgml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index 9339826818c..521216b5d52 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -36,7 +36,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
DO NOTHING
DO UPDATE SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } |
- ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) |
+ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) |
( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> )
} [, ...]
[ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
@@ -174,9 +174,9 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
A substitute name for <replaceable
class="PARAMETER">table_name</replaceable>. When an alias is
provided, it completely hides the actual name of the table.
- This is particularly useful when <literal>ON CONFLICT DO
- UPDATE</literal> targets a table named excluded, since that's
- also the name of the special table representing rows proposed
+ This is particularly useful when <literal>ON CONFLICT DO UPDATE</>
+ targets a table named <varname>excluded</>, since that will otherwise
+ be taken as the name of the special table representing rows proposed
for insertion.
</para>
</listitem>
--
GitLab