diff options
| author | Amit Kapila <akapila@postgresql.org> | 2024-08-29 09:12:12 +0530 |
|---|---|---|
| committer | Amit Kapila <akapila@postgresql.org> | 2024-08-29 09:12:12 +0530 |
| commit | 640178c92e3f6c74d275369b291b507834f1309e (patch) | |
| tree | f290870e19c7b160800289d64c828b1f2f07ea14 /doc/src | |
| parent | 9d90e2bdafbdeba037aa4fee3febe9f48201bf74 (diff) | |
| download | postgresql-640178c92e3f6c74d275369b291b507834f1309e.tar.gz postgresql-640178c92e3f6c74d275369b291b507834f1309e.zip | |
Rename the conflict types for the origin differ cases.
The conflict types 'update_differ' and 'delete_differ' indicate that a row
to be modified was previously altered by another origin. Rename those to
'update_origin_differs' and 'delete_origin_differs' to clarify their
meaning.
Author: Hou Zhijie
Reviewed-by: Shveta Malik, Peter Smith
Discussion: https://postgr.es/m/CAA4eK1+HEKwG_UYt4Zvwh5o_HoCKCjEGesRjJX38xAH3OxuuYA@mail.gmail.com
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/logical-replication.sgml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index bc095d01c00..46917f9f94f 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -1599,7 +1599,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id; </listitem> </varlistentry> <varlistentry> - <term><literal>update_differ</literal></term> + <term><literal>update_origin_differs</literal></term> <listitem> <para> Updating a row that was previously modified by another origin. @@ -1637,7 +1637,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id; </listitem> </varlistentry> <varlistentry> - <term><literal>delete_differ</literal></term> + <term><literal>delete_origin_differs</literal></term> <listitem> <para> Deleting a row that was previously modified by another origin. Note that @@ -1723,7 +1723,7 @@ DETAIL: <replaceable class="parameter">detailed_explanation</replaceable>. <para> The <literal>existing local tuple</literal> section includes the local tuple if its origin differs from the remote tuple for - <literal>update_differ</literal> or <literal>delete_differ</literal> + <literal>update_origin_differs</literal> or <literal>delete_origin_differs</literal> conflicts, or if the key value conflicts with the remote tuple for <literal>insert_exists</literal> or <literal>update_exists</literal> conflicts. |