eval: don't always ignore error from ResolveFunctionByOID

This addresses a comment from the review of #85656. Release note: None
cockroachdb · Aug 10, 2022 · 655ae28 · 655ae28
1 parent c1d005c
commit 655ae28
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pkg/sql/sem/eval/cast.go b/pkg/sql/sem/eval/cast.go
@@ -940,12 +940,15 @@ func performIntToOidCast(
 		return tree.NewDOidWithTypeAndName(o, t, name), nil
 
 	case oid.T_regproc, oid.T_regprocedure:
+		if v == 0 {
+			return tree.WrapAsZeroOid(t), nil
+		}
 		name, _, err := res.ResolveFunctionByOID(ctx, oid.Oid(v))
 		if err != nil {
-			if v == 0 {
-				return tree.WrapAsZeroOid(t), nil
+			if errors.Is(err, tree.ErrFunctionUndefined) {
+				return tree.NewDOidWithType(o, t), nil //nolint:returnerrcheck
 			}
-			return tree.NewDOidWithType(o, t), nil //nolint:returnerrcheck
+			return nil, err
 		}
 		return tree.NewDOidWithTypeAndName(o, t, name), nil