mirror of
https://github.com/postgres/postgres.git
synced 2025-10-25 13:17:41 +03:00
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
This commit is contained in:
@@ -21,7 +21,7 @@ typedef enum
|
||||
CT_INSERT_EXISTS,
|
||||
|
||||
/* The row to be updated was modified by a different origin */
|
||||
CT_UPDATE_DIFFER,
|
||||
CT_UPDATE_ORIGIN_DIFFERS,
|
||||
|
||||
/* The updated row value violates unique constraint */
|
||||
CT_UPDATE_EXISTS,
|
||||
@@ -30,7 +30,7 @@ typedef enum
|
||||
CT_UPDATE_MISSING,
|
||||
|
||||
/* The row to be deleted was modified by a different origin */
|
||||
CT_DELETE_DIFFER,
|
||||
CT_DELETE_ORIGIN_DIFFERS,
|
||||
|
||||
/* The row to be deleted is missing */
|
||||
CT_DELETE_MISSING,
|
||||
|
||||
Reference in New Issue
Block a user