get_expr_result_type probably needs to be able to handle OpExpr as well

tglsfdc · tglsfdc · commit ea19c8772e70 · 2005-04-25T20:59:44.000Z
as FuncExpr, to cover cases where a function returning tuple is invoked
via an operator.
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2005, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.20 2005/04/05 06:22:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.21 2005/04/25 20:59:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -229,6 +229,12 @@ get_expr_result_type(Node *expr,
 										  NULL,
 										  resultTypeId,
 										  resultTupleDesc);
+	else if (expr && IsA(expr, OpExpr))
+		result = internal_get_result_type(get_opcode(((OpExpr *) expr)->opno),
+										  expr,
+										  NULL,
+										  resultTypeId,
+										  resultTupleDesc);
 	else
 	{
 		/* handle as a generic expression; no chance to resolve RECORD */
@@ -247,7 +253,7 @@ get_expr_result_type(Node *expr,
 }
 
 /*
- * get_expr_result_type
+ * get_func_result_type
  *		As above, but work from a function's OID only
  *
  * This will not be able to resolve pure-RECORD results nor polymorphism.

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 2002-2005, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.20 2005/04/05 06:22:14 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.21 2005/04/25 20:59:44 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -229,6 +229,12 @@ get_expr_result_type(Node *expr,`
`229`	`229`	`NULL,`
`230`	`230`	`resultTypeId,`
`231`	`231`	`resultTupleDesc);`
	`232`	`+ else if (expr && IsA(expr, OpExpr))`
	`233`	`+ result = internal_get_result_type(get_opcode(((OpExpr *) expr)->opno),`
	`234`	`+ expr,`
	`235`	`+ NULL,`
	`236`	`+ resultTypeId,`
	`237`	`+ resultTupleDesc);`
`232`	`238`	`else`
`233`	`239`	`{`
`234`	`240`	`/* handle as a generic expression; no chance to resolve RECORD */`
`@@ -247,7 +253,7 @@ get_expr_result_type(Node *expr,`
`247`	`253`	`}`
`248`	`254`
`249`	`255`	`/*`
`250`		`- * get_expr_result_type`
	`256`	`+ * get_func_result_type`
`251`	`257`	`* As above, but work from a function's OID only`
`252`	`258`	`*`
`253`	`259`	`* This will not be able to resolve pure-RECORD results nor polymorphism.`