catalog/funcdesc: break dependency on sql/parser

Release note: None

Author: yuzefovich

pkg/BUILD.bazel

@@ -408,6 +408,7 @@ ALL_TESTS = [
     "//pkg/sql/catalog/descpb:descpb_test",
     "//pkg/sql/catalog/descs:descs_test",
     "//pkg/sql/catalog/externalcatalog:externalcatalog_test",
+    "//pkg/sql/catalog/funcdesc:funcdesc_disallowed_imports_test",
     "//pkg/sql/catalog/funcdesc:funcdesc_test",
     "//pkg/sql/catalog/hydrateddesccache:hydrateddesccache_test",
     "//pkg/sql/catalog/internal/catkv:catkv_test",

pkg/sql/catalog/funcdesc/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("//pkg/testutils:buildutil/buildutil.bzl", "disallowed_imports_test")
 
 go_library(
     name = "funcdesc",
@@ -18,7 +19,7 @@ go_library(
         "//pkg/sql/catalog/catprivilege",
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/catalog/funcinfo",
-        "//pkg/sql/parser",
+        "//pkg/sql/parserutils",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/privilege",
@@ -63,3 +64,8 @@ go_test(
         "@com_github_stretchr_testify//require",
     ],
 )
+
+disallowed_imports_test(
+    src = "funcdesc",
+    disallowed_list = ["//pkg/sql/parser"],
+)

pkg/sql/catalog/funcdesc/func_desc.go

@@ -13,7 +13,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catprivilege"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/funcinfo"
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/privilege"
@@ -986,7 +986,7 @@ func (desc *immutable) ToRoutineObj() (*tree.RoutineObj, error) {
 		}
 		if p.DefaultExpr != nil {
 			var err error
-			ret.Params[i].DefaultVal, err = parser.ParseExpr(*p.DefaultExpr)
+			ret.Params[i].DefaultVal, err = parserutils.ParseExpr(*p.DefaultExpr)
 			if err != nil {
 				return nil, errors.NewAssertionErrorWithWrappedErrf(err, "DEFAULT expr for param %s", p.Name)
 			}
@@ -1048,7 +1048,7 @@ func (desc *immutable) ToOverload() (ret *tree.Overload, err error) {
 			Class: class,
 		}
 		if param.DefaultExpr != nil {
-			routineParam.DefaultVal, err = parser.ParseExpr(*param.DefaultExpr)
+			routineParam.DefaultVal, err = parserutils.ParseExpr(*param.DefaultExpr)
 			if err != nil {
 				return nil, errors.NewAssertionErrorWithWrappedErrf(err, "DEFAULT expr for param %s", param.Name)
 			}
@@ -1127,7 +1127,7 @@ func (desc *immutable) ToCreateExpr() (ret *tree.CreateRoutine, err error) {
 			Class: ToTreeRoutineParamClass(desc.Params[i].Class),
 		}
 		if desc.Params[i].DefaultExpr != nil {
-			ret.Params[i].DefaultVal, err = parser.ParseExpr(*desc.Params[i].DefaultExpr)
+			ret.Params[i].DefaultVal, err = parserutils.ParseExpr(*desc.Params[i].DefaultExpr)
 			if err != nil {
 				return nil, err
 			}