From 976ae401f94211023bbd922205b49b0c31f56ac3 Mon Sep 17 00:00:00 2001
From: Dilip Kumar <dilipkumarb@google.com>
Date: Wed, 11 Jun 2025 05:24:35 +0000
Subject: [PATCH] Improve error codes for logical replication conflict logging

This commit updates error codes used in logical replication
conflict reporting to be more relevant, enhancing clarity
for conflict logging.
---
 src/backend/replication/logical/conflict.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/backend/replication/logical/conflict.c b/src/backend/replication/logical/conflict.c
index 97c4e26b586..1da329ba320 100644
--- a/src/backend/replication/logical/conflict.c
+++ b/src/backend/replication/logical/conflict.c
@@ -173,11 +173,12 @@ errcode_apply_conflict(ConflictType type)
 		case CT_UPDATE_EXISTS:
 		case CT_MULTIPLE_UNIQUE_CONFLICTS:
 			return errcode(ERRCODE_UNIQUE_VIOLATION);
-		case CT_UPDATE_ORIGIN_DIFFERS:
 		case CT_UPDATE_MISSING:
-		case CT_DELETE_ORIGIN_DIFFERS:
 		case CT_DELETE_MISSING:
-			return errcode(ERRCODE_T_R_SERIALIZATION_FAILURE);
+			return errcode(ERRCODE_NO_DATA_FOUND);
+		case CT_UPDATE_ORIGIN_DIFFERS:
+		case CT_DELETE_ORIGIN_DIFFERS:
+			return errcode(ERRCODE_TRIGGERED_DATA_CHANGE_VIOLATION);
 	}
 
 	Assert(false);
-- 
2.50.0.rc0.642.g800a2b2222-goog

