Merge cockroachdb#80659 cockroachdb#81304

80659: sql: add disallowed imports for tree r=ajwerner a=RichardJCai Release note: None 81304: types: fix SQLTypeName for VoidFamily r=rafiss a=otan Release note (bug fix): Fixed a bug where format_type on the void type results in an error. Resolves cockroachdb#81255 Co-authored-by: richardjcai <[email protected]> Co-authored-by: Oliver Tan <[email protected]>
maryliag · May 16, 2022 · 815726a · 815726a
3 parents 55a86a9 + c91e938 + c83bb59
commit 815726a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/pkg/sql/logictest/testdata/logic_test/builtin_function b/pkg/sql/logictest/testdata/logic_test/builtin_function
@@ -2058,6 +2058,7 @@ VALUES (format_type('anyelement'::regtype, -1)),
        (format_type('unknown'::regtype, -1)),
        (format_type('varbit'::regtype, -1)),
        (format_type('varchar'::regtype, -1)),
+       (format_type('void'::regtype, -1)),
        (format_type('int[]'::regtype, -1)),
        (format_type('int2[]'::regtype, -1)),
        (format_type('string[]'::regtype, -1)),
@@ -2102,6 +2103,7 @@ uuid
 unknown
 bit varying
 character varying
+void
 bigint[]
 smallint[]
 text[]
@@ -2155,6 +2157,10 @@ SELECT format_type(oid, -1) FROM pg_type WHERE typname='_text' LIMIT 1
 ----
 text[]
 
+# Ensure each type can be formatted.
+statement ok
+SELECT format_type(oid, NULL) FROM pg_type
+
 query T
 SELECT pg_catalog.pg_get_userbyid((SELECT oid FROM pg_roles WHERE rolname='root'))
 ----

diff --git a/pkg/sql/sem/tree/BUILD.bazel b/pkg/sql/sem/tree/BUILD.bazel
@@ -278,8 +278,11 @@ genrule(
 disallowed_imports_test(
     "tree",
     disallowed_list = [
-        "//pkg/sql/sessiondata",
+        "//pkg/kv",
         "//pkg/security",
+        "//pkg/server",
+        "//pkg/sql/sessiondata",
+        "//pkg/storage",
     ],
     disallowed_prefixes = [
         "pkg/sql/catalog",

diff --git a/pkg/sql/types/types.go b/pkg/sql/types/types.go
@@ -1729,6 +1729,8 @@ func (t *T) SQLStandardNameWithTypmod(haveTypmod bool, typmod int) string {
 		return "unknown"
 	case UuidFamily:
 		return "uuid"
+	case VoidFamily:
+		return "void"
 	case EnumFamily:
 		return t.TypeMeta.Name.Basename()
 	default: