get_expr_result_type probably needs to be able to handle OpExpr as well

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
index b16cbf9beac410c36a90ccbe93ab4e4ebab651b4..3310c9b026afdf8b8250e13d9a8e3d30be1f57f0 100644 (file)
--- 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.