Merge #150777

150777: sql: fix entries for I/O functions for "trigger" and "any" in pg_type r=rafiss a=rafiss

The I/O functions for the trigger and any types were removed in 4285c3b and c381b08. Those commits went too far -- these types have `*_in` and `*_out` functions, but not `*_send` and `*_recv`.

fixes #146255
Release note (bug fix): Fixed the pg_catalog.pg_type enties for the "any" and "trigger" pseudotypes.

Co-authored-by: Rafi Shamim <[email protected]>

Author: craig[bot]

pkg/ccl/logictestccl/testdata/logic_test/triggers

@@ -124,12 +124,16 @@ SELECT 1::TRIGGER;
 statement error pgcode 0A000 pq: cannot accept a value of type trigger
 SELECT NULL:::TRIGGER;
 
-# Triggers should not have a builtin type-conversion function.
-statement error pgcode 42883 pq: unknown function: triggerin\(\)
-SELECT triggerin(1);
+# The builtin type-conversion function should not be usable.
+statement error pgcode 0A000 pq: cannot accept a value of type trigger
+SELECT trigger_in(1);
 
-statement error pgcode 42883 pq: unknown function: triggerin\(\)
-SELECT triggerin(NULL);
+# Builtin type conversion function with NULL argument.
+# NOTE: this case succeeds because the function is not actually called
+# or fully type-checked when it is supplied NULL arguments.
+# statement error pgcode 0A000 pq: cannot accept a value of type trigger
+statement ok
+SELECT trigger_in(NULL);
 
 # ==============================================================================
 # Test invalid usage of the TRIGGER datatype in CREATE statements.

pkg/sql/logictest/testdata/logic_test/pg_catalog

@@ -2193,10 +2193,10 @@ oid     typname                typinput        typoutput        typreceive
 2210    _regclass              array_in        array_out        array_recv        array_send        0         0          0
 2211    _regtype               array_in        array_out        array_recv        array_send        0         0          0
 2249    record                 record_in       record_out       record_recv       record_send       0         0          0
-2276    any                    -               -                -                 -                 0         0          0
+2276    any                    any_in          any_out          -                 -                 0         0          0
 2277    anyarray               anyarray_in     anyarray_out     anyarray_recv     anyarray_send     0         0          0
 2278    void                   voidin          voidout          voidrecv          voidsend          0         0          0
-2279    trigger                -               -                -                 -                 0         0          0
+2279    trigger                trigger_in      trigger_out      -                 -                 0         0          0
 2283    anyelement             anyelement_in   anyelement_out   anyelement_recv   anyelement_send   0         0          0
 2287    _record                array_in        array_out        array_recv        array_send        0         0          0
 2950    uuid                   uuid_in         uuid_out         uuid_recv         uuid_send         0         0          0

pkg/sql/pg_catalog.go

@@ -3581,10 +3581,12 @@ func addPGTypeRow(
 	case types.VoidFamily:
 		// void does not have an array type.
 	case types.TriggerFamily:
-	// trigger does not have an array type.
+		builtinPrefix = "trigger_"
+		// trigger does not have an array type.
 	case types.AnyFamily:
-		// Any does not have an array type. You may be thinking of AnyElement.
 		if typ.Oid() == oid.T_any {
+			builtinPrefix = "any_"
+			// Any does not have an array type.
 			break
 		}
 		fallthrough

pkg/sql/sem/builtins/fixed_oids.go

@@ -2749,6 +2749,10 @@ var builtinOidsArray = []string{
 	2786: `citext(jsonpath: jsonpath) -> citext`,
 	2787: `citext(box2d: box2d) -> citext`,
 	2788: `citext(vector: vector) -> citext`,
+	2789: `any_out(any: any) -> bytes`,
+	2790: `any_in(input: anyelement) -> any`,
+	2791: `trigger_out(trigger: trigger) -> bytes`,
+	2792: `trigger_in(input: anyelement) -> trigger`,
 }
 
 var builtinOidsBySignature map[string]oid.Oid

pkg/sql/sem/builtins/pg_builtins.go

@@ -65,7 +65,6 @@ func makeNotUsableFalseBuiltin() builtinDefinition {
 // programmatically determine whether or not this underscore is present, hence
 // the existence of this map.
 var typeBuiltinsHaveUnderscore = map[oid.Oid]struct{}{
-	// We don't make builtins for T_any because PG's builtins just error but, if we did, they would have underscores.
 	types.Any.Oid():         {},
 	types.AnyElement.Oid():  {},
 	types.AnyArray.Oid():    {},
@@ -84,6 +83,7 @@ var typeBuiltinsHaveUnderscore = map[oid.Oid]struct{}{
 	oid.T_bit:               {},
 	types.Timestamp.Oid():   {},
 	types.TimestampTZ.Oid(): {},
+	types.Trigger.Oid():     {},
 	types.AnyTuple.Oid():    {},
 }
 
@@ -109,14 +109,6 @@ func init() {
 	// Make non-array type i/o builtins.
 	for _, typ := range types.OidToType {
 		switch typ.Oid() {
-		case oid.T_any:
-			// Postgres doesn't have any_send or any_recv. It does have any_in and any_out,
-			// but they always error, so let's just skip these builtins altogether.
-			continue
-		case oid.T_trigger:
-			// TRIGGER is not valid in any context apart from the return-type of a
-			// trigger function.
-			continue
 		case oid.T_int2vector, oid.T_oidvector:
 			// Handled separately below.
 		default:
@@ -292,23 +284,35 @@ func makeTypeIOBuiltin(paramTypes tree.TypeList, returnType *types.T) builtinDef
 	)
 }
 
-// makeTypeIOBuiltins generates the 4 i/o builtins that Postgres implements for
-// every type: typein, typeout, typerecv, and typsend. All 4 builtins are no-op,
-// and only supported because ORMs sometimes use their names to form a map for
-// client-side type encoding and decoding. See issue #12526 for more details.
+// makeTypeIOBuiltins generates the i/o builtins that Postgres implements for
+// each type. Typically this includes typein, typeout, typerecv, and typsend.
+// However, for certain pseudo-types like "any" and "trigger", PostgreSQL only
+// has the in/out functions. All builtins are no-op, and only supported because
+// ORMs sometimes use their names to form a map for client-side type encoding
+// and decoding. See issue #12526 for more details.
 func makeTypeIOBuiltins(builtinPrefix string, typ *types.T) map[string]builtinDefinition {
 	typname := typ.String()
-	return map[string]builtinDefinition{
-		builtinPrefix + "send": makeTypeIOBuiltin(tree.ParamTypes{{Name: typname, Typ: typ}}, types.Bytes),
-		// Note: PG takes type 2281 "internal" for these builtins, which we don't
-		// provide. We won't implement these functions anyway, so it shouldn't
-		// matter.
-		builtinPrefix + "recv": makeTypeIOBuiltin(tree.ParamTypes{{Name: "input", Typ: types.AnyElement}}, typ),
+	result := map[string]builtinDefinition{
 		// Note: PG returns 'cstring' for these builtins, but we don't support that.
 		builtinPrefix + "out": makeTypeIOBuiltin(tree.ParamTypes{{Name: typname, Typ: typ}}, types.Bytes),
 		// Note: PG takes 'cstring' for these builtins, but we don't support that.
 		builtinPrefix + "in": makeTypeIOBuiltin(tree.ParamTypes{{Name: "input", Typ: types.AnyElement}}, typ),
 	}
+
+	// PostgreSQL doesn't have send/recv functions for certain pseudo-types.
+	switch typ.Oid() {
+	case oid.T_any, oid.T_trigger:
+		// PostgreSQL has any_in/any_out and trigger_in/trigger_out but not
+		// any_send/any_recv or trigger_send/trigger_recv.
+	default:
+		result[builtinPrefix+"send"] = makeTypeIOBuiltin(tree.ParamTypes{{Name: typname, Typ: typ}}, types.Bytes)
+		// Note: PG takes type 2281 "internal" for these builtins, which we don't
+		// provide. We won't implement these functions anyway, so it shouldn't
+		// matter.
+		result[builtinPrefix+"recv"] = makeTypeIOBuiltin(tree.ParamTypes{{Name: "input", Typ: types.AnyElement}}, typ)
+	}
+
+	return result
 }
 
 // http://doxygen.postgresql.org/pg__wchar_8h.html#a22e0c8b9f59f6e226a5968620b4bb6a9aac3b065b882d3231ba59297524da2f23