Revise collation derivation method and expression-tree representation.

All expression nodes now have an explicit output-collation field, unless
they are known to only return a noncollatable data type (such as boolean
or record).  Also, nodes that can invoke collation-aware functions store
a separate field that is the collation value to pass to the function.
This avoids confusion that arises when a function has collatable inputs
and noncollatable output type, or vice versa.

Also, replace the parser's on-the-fly collation assignment method with
a post-pass over the completed expression tree.  This allows us to use
a more complex (and hopefully more nearly spec-compliant) assignment
rule without paying for it in extra storage in every expression node.

Fix assorted bugs in the planner's handling of collations by making
collation one of the defining properties of an EquivalenceClass and
by converting CollateExprs into discardable RelabelType nodes during
expression preprocessing.

Author: tglsfdc

src/backend/access/gin/ginutil.c

@@ -61,7 +61,7 @@ initGinState(GinState *state, Relation index)
 		fmgr_info_copy(&(state->compareFn[i]),
 					   index_getprocinfo(index, i + 1, GIN_COMPARE_PROC),
 					   CurrentMemoryContext);
-		fmgr_info_collation(get_typcollation(index->rd_att->attrs[i]->atttypid),
+		fmgr_info_set_collation(get_typcollation(index->rd_att->attrs[i]->atttypid),
 							&(state->compareFn[i]));
 		fmgr_info_copy(&(state->extractValueFn[i]),
 					   index_getprocinfo(index, i + 1, GIN_EXTRACTVALUE_PROC),

src/backend/access/index/indexam.c

@@ -872,7 +872,7 @@ index_getprocinfo(Relation irel,
 				 procnum, attnum, RelationGetRelationName(irel));
 
 		fmgr_info_cxt(procId, locinfo, irel->rd_indexcxt);
-		fmgr_info_collation(irel->rd_indcollation[attnum-1], locinfo);
+		fmgr_info_set_collation(irel->rd_indcollation[attnum-1], locinfo);
 	}
 
 	return locinfo;

src/backend/catalog/dependency.c

@@ -1506,9 +1506,9 @@ find_expr_references_walker(Node *node,
 		add_object_address(OCLASS_TYPE, param->paramtype, 0,
 						   context->addrs);
 		/* and its collation, just as for Consts */
-		if (OidIsValid(param->paramcollation) &&
-			param->paramcollation != DEFAULT_COLLATION_OID)
-			add_object_address(OCLASS_COLLATION, param->paramcollation, 0,
+		if (OidIsValid(param->paramcollid) &&
+			param->paramcollid != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, param->paramcollid, 0,
 							   context->addrs);
 	}
 	else if (IsA(node, FuncExpr))
@@ -1535,19 +1535,19 @@ find_expr_references_walker(Node *node,
 						   context->addrs);
 		/* fall through to examine arguments */
 	}
-	else if (IsA(node, ScalarArrayOpExpr))
+	else if (IsA(node, NullIfExpr))
 	{
-		ScalarArrayOpExpr *opexpr = (ScalarArrayOpExpr *) node;
+		NullIfExpr *nullifexpr = (NullIfExpr *) node;
 
-		add_object_address(OCLASS_OPERATOR, opexpr->opno, 0,
+		add_object_address(OCLASS_OPERATOR, nullifexpr->opno, 0,
 						   context->addrs);
 		/* fall through to examine arguments */
 	}
-	else if (IsA(node, NullIfExpr))
+	else if (IsA(node, ScalarArrayOpExpr))
 	{
-		NullIfExpr *nullifexpr = (NullIfExpr *) node;
+		ScalarArrayOpExpr *opexpr = (ScalarArrayOpExpr *) node;
 
-		add_object_address(OCLASS_OPERATOR, nullifexpr->opno, 0,
+		add_object_address(OCLASS_OPERATOR, opexpr->opno, 0,
 						   context->addrs);
 		/* fall through to examine arguments */
 	}
@@ -1579,6 +1579,11 @@ find_expr_references_walker(Node *node,
 		/* since there is no function dependency, need to depend on type */
 		add_object_address(OCLASS_TYPE, relab->resulttype, 0,
 						   context->addrs);
+		/* the collation might not be referenced anywhere else, either */
+		if (OidIsValid(relab->resultcollid) &&
+			relab->resultcollid != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, relab->resultcollid, 0,
+							   context->addrs);
 	}
 	else if (IsA(node, CoerceViaIO))
 	{

src/backend/catalog/heap.c

@@ -58,6 +58,7 @@
 #include "nodes/nodeFuncs.h"
 #include "optimizer/var.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_relation.h"
 #include "storage/bufmgr.h"
@@ -2387,6 +2388,11 @@ cookDefault(ParseState *pstate,
 			   errhint("You will need to rewrite or cast the expression.")));
 	}
 
+	/*
+	 * Finally, take care of collations in the finished expression.
+	 */
+	assign_expr_collations(pstate, expr);
+
 	return expr;
 }
 
@@ -2414,6 +2420,11 @@ cookConstraint(ParseState *pstate,
 	 */
 	expr = coerce_to_boolean(pstate, expr, "CHECK");
 
+	/*
+	 * Take care of collations.
+	 */
+	assign_expr_collations(pstate, expr);
+
 	/*
 	 * Make sure no outside relations are referred to.
 	 */

src/backend/commands/analyze.c

@@ -1931,7 +1931,7 @@ compute_minimal_stats(VacAttrStatsP stats,
 
 	fmgr_info(mystats->eqfunc, &f_cmpeq);
 	/* We always use the default collation for statistics */
-	fmgr_info_collation(DEFAULT_COLLATION_OID, &f_cmpeq);
+	fmgr_info_set_collation(DEFAULT_COLLATION_OID, &f_cmpeq);
 
 	for (i = 0; i < samplerows; i++)
 	{
@@ -2254,7 +2254,7 @@ compute_scalar_stats(VacAttrStatsP stats,
 	SelectSortFunction(mystats->ltopr, false, &cmpFn, &cmpFlags);
 	fmgr_info(cmpFn, &f_cmpfn);
 	/* We always use the default collation for statistics */
-	fmgr_info_collation(DEFAULT_COLLATION_OID, &f_cmpfn);
+	fmgr_info_set_collation(DEFAULT_COLLATION_OID, &f_cmpfn);
 
 	/* Initial scan to find sortable values */
 	for (i = 0; i < samplerows; i++)

src/backend/commands/functioncmds.c

@@ -51,6 +51,7 @@
 #include "miscadmin.h"
 #include "optimizer/var.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_type.h"
@@ -334,6 +335,7 @@ examine_parameter_list(List *parameters, Oid languageOid,
 
 			def = transformExpr(pstate, fp->defexpr);
 			def = coerce_to_specific_type(pstate, def, toid, "DEFAULT");
+			assign_expr_collations(pstate, def);
 
 			/*
 			 * Make sure no variables are referred to.

src/backend/commands/indexcmds.c

@@ -883,17 +883,34 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
 		}
 
 		/*
-		 * Collation override
+		 * Apply collation override if any
 		 */
 		if (attribute->collation)
+			attcollation = get_collation_oid(attribute->collation, false);
+
+		/*
+		 * Check we have a collation iff it's a collatable type.  The only
+		 * expected failures here are (1) COLLATE applied to a noncollatable
+		 * type, or (2) index expression had an unresolved collation.  But
+		 * we might as well code this to be a complete consistency check.
+		 */
+		if (type_is_collatable(atttype))
+		{
+			if (!OidIsValid(attcollation))
+				ereport(ERROR,
+						(errcode(ERRCODE_INDETERMINATE_COLLATION),
+						 errmsg("no collation was derived for the index expression"),
+						 errhint("Use the COLLATE clause to set the collation explicitly.")));
+		}
+		else
 		{
-			if (!type_is_collatable(atttype))
+			if (OidIsValid(attcollation))
 				ereport(ERROR,
-						(errcode(ERRCODE_SYNTAX_ERROR),
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
 						 errmsg("collations are not supported by type %s",
 								format_type_be(atttype))));
-			attcollation = get_collation_oid(attribute->collation, false);
 		}
+
 		collationOidP[attn] = attcollation;
 
 		/*

src/backend/commands/prepare.c

@@ -23,6 +23,7 @@
 #include "nodes/nodeFuncs.h"
 #include "parser/analyze.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteHandler.h"
@@ -368,6 +369,9 @@ EvaluateParams(PreparedStatement *pstmt, List *params,
 							format_type_be(expected_type_id)),
 			   errhint("You will need to rewrite or cast the expression.")));
 
+		/* Take care of collations in the finished expression. */
+		assign_expr_collations(pstate, expr);
+
 		lfirst(l) = expr;
 		i++;
 	}

src/backend/commands/tablecmds.c

@@ -58,6 +58,7 @@
 #include "optimizer/clauses.h"
 #include "parser/parse_clause.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_relation.h"
@@ -6598,6 +6599,9 @@ ATPrepAlterColumnType(List **wqueue,
 					 errmsg("column \"%s\" cannot be cast to type %s",
 							colName, format_type_be(targettype))));
 
+		/* Fix collations after all else */
+		assign_expr_collations(pstate, transform);
+
 		/*
 		 * Add a work queue item to make ATRewriteTable update the column
 		 * contents.

src/backend/commands/typecmds.c

@@ -54,6 +54,7 @@
 #include "optimizer/planner.h"
 #include "optimizer/var.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_func.h"
 #include "parser/parse_type.h"
@@ -2341,6 +2342,7 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
 	domVal = makeNode(CoerceToDomainValue);
 	domVal->typeId = baseTypeOid;
 	domVal->typeMod = typMod;
+	domVal->collation = get_typcollation(baseTypeOid);
 	domVal->location = -1;		/* will be set when/if used */
 
 	pstate->p_value_substitute = (Node *) domVal;
@@ -2352,6 +2354,11 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
 	 */
 	expr = coerce_to_boolean(pstate, expr, "CHECK");
 
+	/*
+	 * Fix up collation information.
+	 */
+	assign_expr_collations(pstate, expr);
+
 	/*
 	 * Make sure no outside relations are referred to.
 	 */

src/backend/commands/view.c

@@ -129,14 +129,22 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace)
 			def->raw_default = NULL;
 			def->cooked_default = NULL;
 			def->collClause = NULL;
+			def->collOid = exprCollation((Node *) tle->expr);
 			/*
-			 * XXX Temporary kluge to make regression tests pass.  We should
-			 * be able to trust the result of exprCollation more than this.
+			 * It's possible that the column is of a collatable type but the
+			 * collation could not be resolved, so double-check.
 			 */
 			if (type_is_collatable(exprType((Node *) tle->expr)))
-				def->collOid = exprCollation((Node *) tle->expr);
+			{
+				if (!OidIsValid(def->collOid))
+					ereport(ERROR,
+							(errcode(ERRCODE_INDETERMINATE_COLLATION),
+							 errmsg("no collation was derived for view column \"%s\"",
+									def->colname),
+							 errhint("Use the COLLATE clause to set the collation explicitly.")));
+			}
 			else
-				def->collOid = InvalidOid;
+				Assert(!OidIsValid(def->collOid));
 			def->constraints = NIL;
 
 			attrList = lappend(attrList, def);