From 8acdb8bf9cebc42cee5aa96a2d594756b44173c9 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Fri, 11 Mar 2011 16:27:51 -0500
Subject: Split CollateClause into separate raw and analyzed node types.

CollateClause is now used only in raw grammar output, and CollateExpr after
parse analysis.  This is for clarity and to avoid carrying collation names
in post-analysis parse trees: that's both wasteful and possibly misleading,
since the collation's name could be changed while the parsetree still
exists.

Also, clean up assorted infelicities and omissions in processing of the
node type.
---
 src/backend/parser/parse_coerce.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 2fd808d26b2..6aff34dd90d 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -279,11 +279,17 @@ coerce_type(ParseState *pstate, Node *node,
 		if (result)
 			return result;
 	}
-	if (IsA(node, CollateClause))
+	if (IsA(node, CollateExpr))
 	{
-		CollateClause *cc = (CollateClause *) node;
+		/*
+		 * XXX very ugly kluge to push the coercion underneath the CollateExpr.
+		 * This needs to be rethought, as it almost certainly doesn't cover
+		 * all cases.
+		 */
+		CollateExpr *cc = (CollateExpr *) node;
 
-		cc->arg = (Expr *) coerce_type(pstate, (Node *) cc->arg, inputTypeId, targetTypeId, targetTypeMod,
+		cc->arg = (Expr *) coerce_type(pstate, (Node *) cc->arg,
+									   inputTypeId, targetTypeId, targetTypeMod,
 									   ccontext, cformat, location);
 		return (Node *) cc;
 	}
@@ -2121,7 +2127,7 @@ select_common_collation(ParseState *pstate, List *exprs, bool none_ok)
 	{
 		Node	   *pexpr = (Node *) lfirst(lc);
 		Oid			pcoll = exprCollation(pexpr);
-		bool		pexplicit = IsA(pexpr, CollateClause);
+		bool		pexplicit = IsA(pexpr, CollateExpr);
 
 		if (pcoll && pexplicit)
 		{
@@ -2130,7 +2136,7 @@ select_common_collation(ParseState *pstate, List *exprs, bool none_ok)
 			{
 				Node	   *nexpr = (Node *) lfirst(lc2);
 				Oid			ncoll = exprCollation(nexpr);
-				bool		nexplicit = IsA(nexpr, CollateClause);
+				bool		nexplicit = IsA(nexpr, CollateExpr);
 
 				if (!ncoll || !nexplicit)
 					continue;
-- 
cgit v1.2.3