Give left_oper() and right_oper() noError parameters like oper() (the

binary case) already has.  Needed for upcoming ruleutils change.

diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 914edf9e87035d4f6bb6823214200c40fed01ab4..6b1af5d1700c0b0df4a7f60ac2fd20e17859d0bc 100644 (file)
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -109,7 +109,7 @@ make_op(List *opname, Node *ltree, Node *rtree)
        /* right operator? */
        if (rtree == NULL)
        {
-               tup = right_oper(opname, ltypeId);
+               tup = right_oper(opname, ltypeId, false);
                opform = (Form_pg_operator) GETSTRUCT(tup);
                left = make_operand(ltree, ltypeId, opform->oprleft);
                right = NULL;
@@ -118,7 +118,7 @@ make_op(List *opname, Node *ltree, Node *rtree)
        /* left operator? */
        else if (ltree == NULL)
        {
-               tup = left_oper(opname, rtypeId);
+               tup = left_oper(opname, rtypeId, false);
                opform = (Form_pg_operator) GETSTRUCT(tup);
                right = make_operand(rtree, rtypeId, opform->oprright);
                left = NULL;

diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index adc394190a7f2e7a550701fbcb5d0f8aa0a473f3..d7fd15c7607130cbd5cf47ecfb9de9a339e7ed09 100644 (file)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -751,19 +751,21 @@ compatible_oper_funcid(List *op, Oid arg1, Oid arg2, bool noError)
 }
 
 
-/* Given unary right operator (operator on right), return oper struct
+/* right_oper() -- search for a unary right operator (operator on right)
+ * Given operator name and type of arg, return oper struct.
  *
  * IMPORTANT: the returned operator (if any) is only promised to be
  * coercion-compatible with the input datatype.  Do not use this if
  * you need an exact- or binary-compatible match.
  *
- * Always raises error on failure.
+ * If no matching operator found, return NULL if noError is true,
+ * raise an error if it is false.
  *
  * NOTE: on success, the returned object is a syscache entry.  The caller
  * must ReleaseSysCache() the entry when done with it.
  */
 Operator
-right_oper(List *op, Oid arg)
+right_oper(List *op, Oid arg, bool noError)
 {
        FuncCandidateList clist;
        Oid                     operOid = InvalidOid;
@@ -804,26 +806,28 @@ right_oper(List *op, Oid arg)
                                                                 0, 0, 0);
        }
 
-       if (!HeapTupleIsValid(tup))
+       if (!HeapTupleIsValid(tup) && !noError)
                unary_op_error(op, arg, FALSE);
 
        return (Operator) tup;
-}      /* right_oper() */
+}
 
 
-/* Given unary left operator (operator on left), return oper struct
+/* left_oper() -- search for a unary left operator (operator on left)
+ * Given operator name and type of arg, return oper struct.
  *
  * IMPORTANT: the returned operator (if any) is only promised to be
  * coercion-compatible with the input datatype.  Do not use this if
  * you need an exact- or binary-compatible match.
  *
- * Always raises error on failure.
+ * If no matching operator found, return NULL if noError is true,
+ * raise an error if it is false.
  *
  * NOTE: on success, the returned object is a syscache entry.  The caller
  * must ReleaseSysCache() the entry when done with it.
  */
 Operator
-left_oper(List *op, Oid arg)
+left_oper(List *op, Oid arg, bool noError)
 {
        FuncCandidateList clist;
        Oid                     operOid = InvalidOid;
@@ -869,11 +873,11 @@ left_oper(List *op, Oid arg)
                                                                 0, 0, 0);
        }
 
-       if (!HeapTupleIsValid(tup))
+       if (!HeapTupleIsValid(tup) && !noError)
                unary_op_error(op, arg, TRUE);
 
        return (Operator) tup;
-}      /* left_oper() */
+}
 
 
 /* op_error()

diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index f04625c98ab1e7cf4dc9946b2da14469406344cd..67345890285b1f316c3b11e4e965438a27963bdb 100644 (file)
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -27,8 +27,8 @@ extern Oid    LookupOperNameTypeNames(List *opername, TypeName *oprleft,
 /* Routines to find operators matching a name and given input types */
 /* NB: the selected operator may require coercion of the input types! */
 extern Operator oper(List *op, Oid arg1, Oid arg2, bool noError);
-extern Operator right_oper(List *op, Oid arg);
-extern Operator left_oper(List *op, Oid arg);
+extern Operator right_oper(List *op, Oid arg, bool noError);
+extern Operator left_oper(List *op, Oid arg, bool noError);
 
 /* Routines to find operators that DO NOT require coercion --- ie, their */
 /* input types are either exactly as given, or binary-compatible */