From 7cf8a5c302735d193dcf901b87e03e324903c632 Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Mon, 2 Apr 2018 21:34:15 +0100
Subject: Revert "Modified files for MERGE"

This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
---
 src/backend/optimizer/util/plancat.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/backend/optimizer/util/plancat.c')

diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 8a6baa7bea..0231f8bf7c 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -1835,10 +1835,6 @@ has_row_triggers(PlannerInfo *root, Index rti, CmdType event)
 				 trigDesc->trig_delete_before_row))
 				result = true;
 			break;
-			/* There is no separate event for MERGE, only INSERT/UPDATE/DELETE */
-		case CMD_MERGE:
-			result = false;
-			break;
 		default:
 			elog(ERROR, "unrecognized CmdType: %d", (int) event);
 			break;
-- 
cgit v1.2.1