Skip to content

Commit a03a1a0

Browse files
craig[bot]yuzefovich
andcommitted
Merge #154989
154989: randgen: import plpgsql/parser to inject sql/parser.ParseDoBlockFn r=yuzefovich a=yuzefovich We recently extended sqlsmith to generate DO blocks. Those are handled in the sql parser via an injected function, so we need to ensure that the injection happens. We got a test failure where usage of `randgen` package resulted in a crash, so make it depend on the `plpgsql/parser` to do the injection. Fixes: #154806. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
2 parents f9fabcd + 2bb4a2c commit a03a1a0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

pkg/sql/randgen/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ go_library(
3030
"//pkg/sql/oidext",
3131
"//pkg/sql/parser",
3232
"//pkg/sql/pgrepl/lsn",
33+
"//pkg/sql/plpgsql/parser",
3334
"//pkg/sql/rowenc",
3435
"//pkg/sql/rowenc/valueside",
3536
"//pkg/sql/sem/cast",

pkg/sql/randgen/mutator.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ import (
1919
"github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo"
2020
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
2121
"github.com/cockroachdb/cockroach/pkg/sql/parser"
22+
// Ensure that sql/parser.ParseDoBlockFn is injected from the PLpgSQL
23+
// parser.
24+
_ "github.com/cockroachdb/cockroach/pkg/sql/plpgsql/parser"
2225
"github.com/cockroachdb/cockroach/pkg/sql/rowenc"
2326
"github.com/cockroachdb/cockroach/pkg/sql/sem/idxtype"
2427
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"

0 commit comments

Comments
 (0)