From b1a73683c9dd21d955444afd359cc5ff9f39530b Mon Sep 17 00:00:00 2001
From: Eric Wang <ericw@cockroachlabs.com>
Date: Thu, 8 Apr 2021 15:55:48 -0400
Subject: [PATCH] sql: serialize user defined type annotation of arrays

Previously, user defined type annotations for
arrays were not serialized. As a result, when we
renamed the type of the array, the expression
would become corrupted.
This patch addresses this by serializing the
type annotation using its OID.

Release note: None
---
 pkg/sql/logictest/testdata/logic_test/enums | 44 +++++++++++++++++++++
 pkg/sql/sem/tree/expr.go                    |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/pkg/sql/logictest/testdata/logic_test/enums b/pkg/sql/logictest/testdata/logic_test/enums
index 38cbbbaed675..308fa4e69786 100644
--- a/pkg/sql/logictest/testdata/logic_test/enums
+++ b/pkg/sql/logictest/testdata/logic_test/enums
@@ -1476,3 +1476,47 @@ ALTER TYPE computed_abc2 DROP VALUE 'a'
 
 statement error could not remove enum value "b" as it is being used in a computed column of "t7"
 ALTER TYPE computed_abc2 DROP VALUE 'b'
+
+
+# Test that types used in arrays can be renamed.
+subtest rename_type_in_array
+
+statement ok
+CREATE TYPE arr_typ AS ENUM ('a', 'b', 'c')
+
+statement ok
+CREATE TABLE arr_t6 (
+  i arr_typ[] DEFAULT ARRAY['a'::arr_typ],
+  j arr_typ DEFAULT ARRAY['b'::arr_typ][1],
+  k _arr_typ DEFAULT ARRAY['c'::arr_typ]::_arr_typ,
+  FAMILY (i, j, k))
+
+statement ok
+ALTER TYPE arr_typ RENAME TO arr_typ2
+
+statement ok
+INSERT INTO arr_t6 VALUES (default, default, default)
+
+query TT
+SHOW CREATE TABLE arr_t6
+----
+arr_t6  CREATE TABLE public.arr_t6 (
+        i public.arr_typ2[] NULL DEFAULT ARRAY['a':::public.arr_typ2]:::public.arr_typ2[],
+        j public.arr_typ2 NULL DEFAULT (ARRAY['b':::public.arr_typ2]:::public.arr_typ2[])[1:::INT8],
+        k public.arr_typ2[] NULL DEFAULT ARRAY['c':::public.arr_typ2]:::public.arr_typ2[],
+        rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
+        CONSTRAINT "primary" PRIMARY KEY (rowid ASC),
+        FAMILY fam_0_i_j_k_rowid (i, j, k, rowid)
+)
+
+
+subtest regression_63138
+
+statement ok
+CREATE TYPE typ2 AS ENUM ('a')
+
+statement ok
+CREATE TABLE tab (k typ2 PRIMARY KEY)
+
+statement ok
+CREATE INDEX foo ON tab(k) WHERE k = ANY (ARRAY['a', 'a']:::typ2[])
diff --git a/pkg/sql/sem/tree/expr.go b/pkg/sql/sem/tree/expr.go
index d5c6b4ddac20..3521033b6889 100644
--- a/pkg/sql/sem/tree/expr.go
+++ b/pkg/sql/sem/tree/expr.go
@@ -963,7 +963,7 @@ func (node *Array) Format(ctx *FmtCtx) {
 	if ctx.HasFlags(FmtParsable) && node.typ != nil {
 		if node.typ.ArrayContents().Family() != types.UnknownFamily {
 			ctx.WriteString(":::")
-			ctx.Buffer.WriteString(node.typ.SQLString())
+			ctx.FormatTypeReference(node.typ)
 		}
 	}
 }