Merge cockroachdb#126351

126351: Cannot restore backup unknown type kind COMPOSITE r=Dedej-Bergin a=Dedej-Bergin

Added the handling for the composite type case.

Fixes: cockroachdb#125550

Release note (bug fix): Fixed a bug that made it impossible to restore a database that contains a composite type.

Co-authored-by: Bergin Dedej <bergin.dedej@cockroachlabs.com>

pkg/ccl/backupccl/testdata/backup-restore/user-defined-types

@@ -154,6 +154,10 @@ exec-sql
 CREATE TYPE d.farewell AS ENUM ('bye', 'cya');
 ----
 
+exec-sql
+CREATE TYPE d.roach_status AS (queen_roach UUID, king_roach  UUID, worker_roach INT);
+----
+
 exec-sql
 CREATE TABLE d.t1 (x d.greeting);
 ----

pkg/sql/catalog/rewrite/rewrite.go

@@ -657,7 +657,7 @@ func TypeDescs(types []*typedesc.Mutable, descriptorRewrites jobspb.DescRewriteM
 			}
 		}
 		switch t := typ.Kind; t {
-		case descpb.TypeDescriptor_ENUM, descpb.TypeDescriptor_MULTIREGION_ENUM:
+		case descpb.TypeDescriptor_ENUM, descpb.TypeDescriptor_COMPOSITE, descpb.TypeDescriptor_MULTIREGION_ENUM:
 			if rw, ok := descriptorRewrites[typ.ArrayTypeID]; ok {
 				typ.ArrayTypeID = rw.ID
 			}