Please find v7 patch-set, the changes are:
Patch 0001 - Reflects v5 of Conflict Detection patch in [1].
Patch 0002:
a) Removed global CONFLICT RESOLVER syntax and logic.
b) Added new syntax for creating CONFLICT RESOLVERs at the subscription level.
Syntax for CREATE SUBSCRIPTION:
CREATE SUBSCRIPTION <subname> CONNECTION <conninfo> PUBLICATION <pubname> CONFLICT RESOLVER
(conflict_type1 = resolver1, conflict_type2 = resolver2, conflict_type3 = resolver3, ...);
Syntax for ALTER SUBSCRIPTION:
ALTER SUBSCRIPTION <subname> CONFLICT RESOLVER
(conflict_type1 = resolver1, conflict_type2 = resolver2, conflict_type3 = resolver3, ...);
Patch 0003 - Supports subscription-level resolvers for conflict resolution.
Patch 0004 - Modified last_update_win related test cases to reflect the new syntax.
Patch 0005 - Dropped for the time being; will rebase and post in the next version.
Thanks to Shveta for design discussions and thanks to Nisha for helping in rebasing the patch and helping in testing and stabilizing the patch by providing comments off-list.
[1] -
https://www.postgresql.org/message-id/OS0PR01MB57166C2566E00676649CF48B94AC2@OS0PR01MB5716.jpnprd01.prod.outlook.com