Fix failure to propagate collation in negate_clause().

tglsfdc · tglsfdc · commit c8e993503d0f · 2011-03-25T18:44:47.000-04:00
Turns out it was this, and not so much plpgsql, that was at fault in Stefan
Huehner's collation-error-in-a-trigger bug report of a couple weeks ago.
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
@@ -104,6 +104,8 @@ negate_clause(Node *node)
 					newopexpr->opfuncid = InvalidOid;
 					newopexpr->opresulttype = opexpr->opresulttype;
 					newopexpr->opretset = opexpr->opretset;
+					newopexpr->opcollid = opexpr->opcollid;
+					newopexpr->inputcollid = opexpr->inputcollid;
 					newopexpr->args = opexpr->args;
 					newopexpr->location = opexpr->location;
 					return (Node *) newopexpr;
@@ -126,6 +128,7 @@ negate_clause(Node *node)
 					newopexpr->opno = negator;
 					newopexpr->opfuncid = InvalidOid;
 					newopexpr->useOr = !saopexpr->useOr;
+					newopexpr->inputcollid = saopexpr->inputcollid;
 					newopexpr->args = saopexpr->args;
 					newopexpr->location = saopexpr->location;
 					return (Node *) newopexpr;
