sem/eval: break dependency on sql/parser

This is achieved by injecting `parser.ParseOne` when initializing the
sql package.

Release note: None

Author: yuzefovich

pkg/BUILD.bazel

@@ -568,6 +568,7 @@ ALL_TESTS = [
     "//pkg/sql/opt:opt_test",
     "//pkg/sql/parser:parser_disallowed_imports_test",
     "//pkg/sql/parser:parser_test",
+    "//pkg/sql/parserutils:parserutils_disallowed_imports_test",
     "//pkg/sql/pgrepl/pgreplparser:pgreplparser_test",
     "//pkg/sql/pgrepl:pgrepl_test",
     "//pkg/sql/pgwire/hba:hba_test",

pkg/sql/BUILD.bazel

@@ -463,6 +463,7 @@ go_library(
         "//pkg/sql/paramparse",
         "//pkg/sql/parser",
         "//pkg/sql/parser/statements",
+        "//pkg/sql/parserutils",
         "//pkg/sql/pgrepl/lsn",
         "//pkg/sql/pgrepl/lsnutil",
         "//pkg/sql/pgrepl/pgrepltree",

pkg/sql/exec_util.go

@@ -74,6 +74,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/optionalnodeliveness"
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/sql/parser/statements"
+	"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/pgwire/pgnotice"
@@ -144,6 +145,13 @@ func init() {
 		ie := evalCtx.JobExecContext.(JobExecContext).ExecCfg().InternalDB.Executor()
 		return ie.QueryIteratorEx(ctx, opName, txn, override, stmt, qargs...)
 	}
+	DoParserInjection()
+}
+
+// DoParserInjection performs all the necessary sql/parser injections within the
+// sql directory.
+func DoParserInjection() {
+	parserutils.ParseOne = parser.ParseOne
 }
 
 // ClusterOrganization is the organization name.

pkg/sql/parserutils/BUILD.bazel

@@ -1,13 +1,21 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("//pkg/testutils:buildutil/buildutil.bzl", "disallowed_imports_test")
 
 go_library(
     name = "parserutils",
     srcs = ["utils.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/parserutils",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/sql/parser/statements",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
+        "//pkg/sql/sem/tree",
         "@com_github_cockroachdb_errors//:errors",
     ],
 )
+
+disallowed_imports_test(
+    src = "parserutils",
+    disallowed_list = ["//pkg/sql/parser"],
+)

pkg/sql/parserutils/utils.go

@@ -10,8 +10,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/cockroachdb/cockroach/pkg/sql/parser/statements"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
+	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/errors"
 )
 
@@ -54,3 +56,9 @@ func PopulateErrorDetails(
 	fmt.Fprintf(&buf, "%s^", strings.Repeat(" ", int(lastTokPos)-j))
 	return errors.WithDetail(retErr, buf.String())
 }
+
+// ParseOne is the same as sql/parser.ParseOne but is injected to avoid a
+// dependency on the parser package.
+var ParseOne = func(sql string) (statements.Statement[tree.Statement], error) {
+	return statements.Statement[tree.Statement]{}, errors.AssertionFailedf("sql.DoParserInjection hasn't been called")
+}

pkg/sql/sem/eval/BUILD.bazel

@@ -57,7 +57,7 @@ go_library(
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/lex",
         "//pkg/sql/oidext",
-        "//pkg/sql/parser",
+        "//pkg/sql/parserutils",
         "//pkg/sql/pgrepl/lsn",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
@@ -170,5 +170,6 @@ disallowed_imports_test(
     src = "eval",
     disallowed_list = [
         "//pkg/sql/catalog",
+        "//pkg/sql/parser",
     ],
 )

pkg/sql/sem/eval/parse_doid.go

@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"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/sem/catid"
@@ -93,7 +93,7 @@ func ParseDOid(ctx context.Context, evalCtx *Context, s string, t *types.T) (*tr
 		// function signature syntax is sane from grammar perspective. We may
 		// match postgres' implementation of `parseNameAndArgTypes` to return
 		// more detailed errors like "expected a left parenthesis".
-		stmt, err := parser.ParseOne("ALTER FUNCTION " + strings.TrimSpace(s) + " IMMUTABLE")
+		stmt, err := parserutils.ParseOne("ALTER FUNCTION " + strings.TrimSpace(s) + " IMMUTABLE")
 		if err != nil {
 			return nil, errors.Wrapf(err, "invalid function signature: %s", s)
 		}