Merge #136020

136020: optbuilder: remove enterprise check for plgpsql r=rafiss a=rafiss Now that all clusters require a license, we can remove this check. This simplifies testing setup when using plpgsql, as we no longer need to add a dependency on the ccl package from tests in other packages. Epic: None Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Nov 23, 2024 · f717f6b · f717f6b
2 parents cea3ff5 + 3bbeee1
commit f717f6b
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 97 deletions.
diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
@@ -965,7 +965,6 @@ GO_TARGETS = [
     "//pkg/ccl/pgcryptoccl/pgcryptocipherccl:pgcryptocipherccl_test",
     "//pkg/ccl/pgcryptoccl:pgcryptoccl",
     "//pkg/ccl/pgcryptoccl:pgcryptoccl_test",
-    "//pkg/ccl/plpgsqlccl:plpgsqlccl",
     "//pkg/ccl/revertccl:revertccl",
     "//pkg/ccl/revertccl:revertccl_test",
     "//pkg/ccl/schemachangerccl:schemachangerccl",
@@ -2089,7 +2088,6 @@ GO_TARGETS = [
     "//pkg/sql/plpgsql/parser/lexbase:lexbase",
     "//pkg/sql/plpgsql/parser:parser_test",
     "//pkg/sql/plpgsql/parser:plpgparser",
-    "//pkg/sql/plpgsql:plpgsql",
     "//pkg/sql/privilege:privilege",
     "//pkg/sql/privilege:privilege_test",
     "//pkg/sql/protoreflect/gprototest:gprototest",

diff --git a/pkg/ccl/BUILD.bazel b/pkg/ccl/BUILD.bazel
@@ -26,7 +26,6 @@ go_library(
         "//pkg/ccl/oidcccl",
         "//pkg/ccl/partitionccl",
         "//pkg/ccl/pgcryptoccl",
-        "//pkg/ccl/plpgsqlccl",
         "//pkg/ccl/securityccl/fipsccl",
         "//pkg/ccl/storageccl",
         "//pkg/ccl/storageccl/engineccl",

diff --git a/pkg/ccl/ccl_init.go b/pkg/ccl/ccl_init.go
@@ -29,7 +29,6 @@ import (
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/oidcccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/partitionccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/pgcryptoccl"
-	_ "github.com/cockroachdb/cockroach/pkg/ccl/plpgsqlccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/securityccl/fipsccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/storageccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl"

diff --git a/pkg/ccl/plpgsqlccl/BUILD.bazel b/pkg/ccl/plpgsqlccl/BUILD.bazel
diff --git a/pkg/ccl/plpgsqlccl/plpgsql.go b/pkg/ccl/plpgsqlccl/plpgsql.go
diff --git a/pkg/sql/logictest/testdata/logic_test/plpgsql_license b/pkg/sql/logictest/testdata/logic_test/plpgsql_license
diff --git a/pkg/sql/logictest/tests/local/generated_test.go b/pkg/sql/logictest/tests/local/generated_test.go
diff --git a/pkg/sql/opt/optbuilder/BUILD.bazel b/pkg/sql/opt/optbuilder/BUILD.bazel
@@ -80,7 +80,6 @@ go_library(
         "//pkg/sql/parser/statements",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
-        "//pkg/sql/plpgsql",
         "//pkg/sql/plpgsql/parser:plpgparser",
         "//pkg/sql/privilege",
         "//pkg/sql/sem/asof",

diff --git a/pkg/sql/opt/optbuilder/create_function.go b/pkg/sql/opt/optbuilder/create_function.go
@@ -17,7 +17,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
-	"github.com/cockroachdb/cockroach/pkg/sql/plpgsql"
 	plpgsqlparser "github.com/cockroachdb/cockroach/pkg/sql/plpgsql/parser"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/cast"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/plpgsqltree"
@@ -101,11 +100,6 @@ func (b *Builder) buildCreateFunction(cf *tree.CreateRoutine, inScope *scope) (o
 	if !languageFound {
 		panic(pgerror.New(pgcode.InvalidFunctionDefinition, "no language specified"))
 	}
-	if language == tree.RoutineLangPLpgSQL {
-		if err := plpgsql.CheckClusterSupportsPLpgSQL(b.evalCtx.Settings); err != nil {
-			panic(err)
-		}
-	}
 
 	// Track the dependencies in the arguments, return type, and statements in
 	// the function body.

diff --git a/pkg/sql/plpgsql/BUILD.bazel b/pkg/sql/plpgsql/BUILD.bazel
diff --git a/pkg/sql/plpgsql/plpgsql.go b/pkg/sql/plpgsql/plpgsql.go