From 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Mon, 2 Apr 2018 21:12:47 +0100
Subject: Modified files for MERGE

---
 src/backend/parser/parse_collate.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/backend/parser/parse_collate.c')

diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c
index 6d34245083..51c73c4018 100644
--- a/src/backend/parser/parse_collate.c
+++ b/src/backend/parser/parse_collate.c
@@ -485,6 +485,7 @@ assign_collations_walker(Node *node, assign_collations_context *context)
 		case T_FromExpr:
 		case T_OnConflictExpr:
 		case T_SortGroupClause:
+		case T_MergeAction:
 			(void) expression_tree_walker(node,
 										  assign_collations_walker,
 										  (void *) &loccontext);
-- 
cgit v1.2.1