fix_simplify_aggref.patch

application/octet-stream

Filename: fix_simplify_aggref.patch

Type: application/octet-stream

Part: 0

Message: Re: Segmentation fault in var_is_nonnullable when running query with COUNT() on 42473b3b

diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 9975185934b..bda4c4eb292 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -2638,7 +2638,9 @@ eval_const_expressions_mutator(Node *node,
 			}
 		case T_Aggref:
 			node = ece_generic_processing(node);
-			return simplify_aggref((Aggref *) node, context);
+			if (context->root != NULL)
+				return simplify_aggref((Aggref *) node, context);
+			return node;
 		case T_OpExpr:
 			{
 				OpExpr	   *expr = (OpExpr *) node;