From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 23 May 2016 23:23:36 +0000 (-0400)
Subject: Support IndexElem in raw_expression_tree_walker().
X-Git-Tag: REL9_6_BETA2~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eae1ad9b64eaa201444ff99848f674be91af0ee6;p=thirdparty%2Fpostgresql.git

Support IndexElem in raw_expression_tree_walker().

Needed for cases in which INSERT ... ON CONFLICT appears inside a
recursive CTE item.  Per bug #14153 from Thomas Alton.

Patch by Peter Geoghegan, slightly adjusted by me

Report: <20160521232802.22598.13537@wrigleys.postgresql.org>
---

diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 92f32768f84..1ac51a7b2fc 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -3372,6 +3372,15 @@ raw_expression_tree_walker(Node *node,
 				/* for now, constraints are ignored */
 			}
 			break;
+		case T_IndexElem:
+			{
+				IndexElem  *indelem = (IndexElem *) node;
+
+				if (walker(indelem->expr, context))
+					return true;
+				/* collation and opclass names are deemed uninteresting */
+			}
+			break;
 		case T_GroupingSet:
 			return walker(((GroupingSet *) node)->content, context);
 		case T_LockingClause: