diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/protocol.sgml | 13 | ||||
| -rw-r--r-- | doc/src/sgml/ref/insert.sgml | 21 |
2 files changed, 10 insertions, 24 deletions
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index d985204566c..c7df697845e 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -3011,16 +3011,9 @@ CommandComplete (B) <literal>INSERT <replaceable>oid</replaceable> <replaceable>rows</replaceable></literal>, where <replaceable>rows</replaceable> is the number of rows - inserted. However, if and only if <literal>ON CONFLICT - UPDATE</> is specified, then the tag is <literal>UPSERT - <replaceable>oid</replaceable> - <replaceable>rows</replaceable></literal>, where - <replaceable>rows</replaceable> is the number of rows inserted - <emphasis>or updated</emphasis>. - <replaceable>oid</replaceable> is the object ID of the - inserted row if <replaceable>rows</replaceable> is 1 and the - target table has OIDs, and (for the <literal>UPSERT</literal> - tag), the row was actually inserted rather than updated; + inserted. <replaceable>oid</replaceable> is the object ID + of the inserted row if <replaceable>rows</replaceable> is 1 + and the target table has OIDs; otherwise <replaceable>oid</replaceable> is 0. </para> diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 3c3315eab3d..7cd4577f1ea 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -497,20 +497,13 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <screen> INSERT <replaceable>oid</replaceable> <replaceable class="parameter">count</replaceable> </screen> - However, in the event of an <literal>ON CONFLICT DO UPDATE</> clause - (but <emphasis>not</emphasis> in the event of an <literal>ON - CONFLICT DO NOTHING</> clause), the command tag reports the number of - rows inserted or updated together, of the form -<screen> -UPSERT <replaceable>oid</replaceable> <replaceable class="parameter">count</replaceable> -</screen> - The <replaceable class="parameter">count</replaceable> is the number - of rows inserted. If <replaceable class="parameter">count</replaceable> - is exactly one, and the target table has OIDs, then - <replaceable class="parameter">oid</replaceable> is the - <acronym>OID</acronym> - assigned to the inserted row (but not if there is only a single - updated row). Otherwise <replaceable + The <replaceable class="parameter">count</replaceable> is the + number of rows inserted or updated. If <replaceable + class="parameter">count</replaceable> is exactly one, and the + target table has OIDs, then <replaceable + class="parameter">oid</replaceable> is the <acronym>OID</acronym> + assigned to the inserted row. The single row must have been + inserted rather than updated. Otherwise <replaceable class="parameter">oid</replaceable> is zero. </para> |